From patchwork Sat Jun 25 18:37:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9198645 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A263260754 for ; Sat, 25 Jun 2016 18:38:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9688E28522 for ; Sat, 25 Jun 2016 18:38:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B4BD28526; Sat, 25 Jun 2016 18:38:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 371BE28522 for ; Sat, 25 Jun 2016 18:38:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751794AbcFYSiV (ORCPT ); Sat, 25 Jun 2016 14:38:21 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:34669 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751623AbcFYSiR (ORCPT ); Sat, 25 Jun 2016 14:38:17 -0400 Received: by mail-oi0-f68.google.com with SMTP id s17so23970698oih.1 for ; Sat, 25 Jun 2016 11:38:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Tfed+KQeLzH8BxkHObvj2pus7zx0n4z3CUHxymb6XNI=; b=x/aGNaVgBOyvb66Pa8DwURC7Gor/W91LF2t4WXMbfc2J2bkU3e+hCm1sr8ZvE6hzJG 9XtqiDLhiB0OhZRl3FDD6LL/RE+Zo8E4obPdMADq4rhum75RttiyOTmQBPZzY7T9aJO/ hKdguZt0m9f+YmOq4d/hiqJuSiVY+SEy+aYgUMCamSg9ifMTwZ1CpM7AvSEEsgCWUbkd MEDKKDAIdHHl2wYpXdG8wcsgSXfNsr2k1Tg+I7qTf8OuM7b5hvHaJnuAfq73PM++oWZR eiGL4JXrg7yQBRFRpYCiZmOzhDgeQ34n5RCUXzbKCa5ItVt29bti1yPvNj9ICOgjwRpm tmbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Tfed+KQeLzH8BxkHObvj2pus7zx0n4z3CUHxymb6XNI=; b=Q1bM1q4wui1vPvKjdy2vKwZ8pKUoEuDb25C+LVK6UnoKwFBR2yArpb3P8Gv+klVacD 042GCpCe+hE98NPucPp3A3Jc+SJ7dTsx3zGiVBnaAJJK2SBHN5MF6ZRgMul62hYhBrHU lRKaNll/6uFP0ZKvEgA/ZsErva1fKrIM/QSJnW9fgK7jR164lRVIMoSwf4iSS0zfuOzw gEbhwIFYDX/ZRru+8lIcSmCdvvm43ur4wGatt2/PQpemNVkS0/9W1ocIMal5uG3s8DYT drKHTkaxW12BP07pywPjeuqkLS0N9Ew9cni0PckMu6vBVTso19IVT8+lg0tHK40Hd35x S6Gg== X-Gm-Message-State: ALyK8tKhQyrx3NmjUuLBG1W6i2BFrxEl2yvqF5zq4qai0Ceh0CKVqVE0aL9H9Plg3kkZ1Q== X-Received: by 10.202.73.9 with SMTP id w9mr6721715oia.141.1466879896987; Sat, 25 Jun 2016 11:38:16 -0700 (PDT) Received: from linux.site (cpe-24-31-249-175.kc.res.rr.com. [24.31.249.175]) by smtp.gmail.com with ESMTPSA id w6sm5736850ota.10.2016.06.25.11.38.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Jun 2016 11:38:16 -0700 (PDT) From: Larry Finger To: kvalo@codeaurora.org Cc: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org, Larry Finger , Pavel Andrianov Subject: [PATCH 4/6] rtlwifi: rtl8723be: Fix potential race condition Date: Sat, 25 Jun 2016 13:37:45 -0500 Message-Id: <1466879867-2499-5-git-send-email-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1466879867-2499-1-git-send-email-Larry.Finger@lwfinger.net> References: <1466879867-2499-1-git-send-email-Larry.Finger@lwfinger.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Flag rfchange_inprogress in struct rtl_ps_ctl is protected by a spinlock in most routines but not in rtl8723be_dm_watchdog(), which could lead to a race condition. The necessary locking to prevent this condition is added. Reported-by: Pavel Andrianov Signed-off-by: Larry Finger Cc: Pavel Andrianov --- drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c index 3a81cdb..9a4715ab 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c @@ -1279,6 +1279,7 @@ void rtl8723be_dm_watchdog(struct ieee80211_hw *hw) if (ppsc->p2p_ps_info.p2p_ps_mode) fw_ps_awake = false; + spin_lock(&rtlpriv->locks.rf_ps_lock); if ((ppsc->rfpwr_state == ERFON) && ((!fw_current_inpsmode) && fw_ps_awake) && (!ppsc->rfchange_inprogress)) { @@ -1294,5 +1295,6 @@ void rtl8723be_dm_watchdog(struct ieee80211_hw *hw) rtl8723be_dm_check_txpower_tracking(hw); rtl8723be_dm_dynamic_txpower(hw); } + spin_unlock(&rtlpriv->locks.rf_ps_lock); rtlpriv->dm.dbginfo.num_qry_beacon_pkt = 0; }