From patchwork Tue Mar 18 14:45:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 3854111 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4EE589F4BD for ; Wed, 19 Mar 2014 17:47:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 249D1200DF for ; Wed, 19 Mar 2014 17:47:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A6CF20203 for ; Wed, 19 Mar 2014 17:47:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756292AbaCROqq (ORCPT ); Tue, 18 Mar 2014 10:46:46 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:64608 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756279AbaCROqn (ORCPT ); Tue, 18 Mar 2014 10:46:43 -0400 Received: by mail-ee0-f46.google.com with SMTP id t10so5439635eei.19 for ; Tue, 18 Mar 2014 07:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yh9DXb6RagnjhbWNSe0OpGr/jRw1sshFFdi3IO3UNjw=; b=KslYSWeqFvYMUWr9nrFoLsv4sfw/KFCGJh0/WsJYhBDOr+2sF7hJ9ROh05Qliiduye 9KpZ4KmCFoZGDnwdSHa/gd7NX+wLCpLyBRqM9gsXhwceLaSjViYBPhn9/88VH2jHDAyE zLgMY4P9SqvnkKX9eTDX+E+xpxfHAMchjRcAI5TKFKQqjL6Tj8VhyaRF2/hCeCrhrSO2 Q8/bNoViCZ/B2+RDZIvOKayjRSHUOH0EZYfa2FNvIUQBMgk+UL+WC65k0A/aPjPknNWN qXt26oDlutNzeRFvt1a6LudPycssjGq/MBRhInq+hauWkzZLuPvG/LavtQWFxNIfku6U /BVg== X-Received: by 10.15.35.66 with SMTP id f42mr3786587eev.93.1395154002649; Tue, 18 Mar 2014 07:46:42 -0700 (PDT) Received: from localhost.localdomain (109-186-95-36.bb.netvision.net.il. [109.186.95.36]) by mx.google.com with ESMTPSA id p8sm35492776eef.26.2014.03.18.07.46.41 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Mar 2014 07:46:41 -0700 (PDT) From: Emmanuel Grumbach To: linux-wireless@vger.kernel.org Cc: Emmanuel Grumbach Subject: [PATCH 32/35] iwlwifi: mvm: fix theoretical NULL ptr dereference Date: Tue, 18 Mar 2014 16:45:36 +0200 Message-Id: <1395153939-23897-32-git-send-email-egrumbach@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <53285AF8.7050305@gmail.com> References: <53285AF8.7050305@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Emmanuel Grumbach mvmsta could have been NULL / ERR. Reviewed-by: Johannes Berg Signed-off-by: Emmanuel Grumbach --- drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c index f64e972..9b59e1d 100644 --- a/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c +++ b/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c @@ -312,6 +312,11 @@ static ssize_t iwl_dbgfs_reduced_txp_write(struct ieee80211_vif *vif, mutex_lock(&mvm->mutex); mvmsta = iwl_mvm_sta_from_staid_protected(mvm, mvmvif->ap_sta_id); + if (IS_ERR_OR_NULL(mvmsta)) { + mutex_unlock(&mvm->mutex); + return -ENOTCONN; + } + mvmsta->bt_reduced_txpower_dbg = false; ret = iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif->ap_sta_id, reduced_tx_power);