Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1883075ybz; Thu, 30 Apr 2020 07:10:34 -0700 (PDT) X-Google-Smtp-Source: APiQypKTPCsUBIjpfc1Vo7dqicRruU0Cz5lmysWgwa8wbQ+0VkbUdL+Sskd7Kow629EpAVvJr/lW X-Received: by 2002:a17:906:f251:: with SMTP id gy17mr2619183ejb.369.1588255834131; Thu, 30 Apr 2020 07:10:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588255834; cv=none; d=google.com; s=arc-20160816; b=UNw+IQV/bxlNY0FBtFSU/oMv+xOwp5huANSLnWKUys+anp8gEQLNls/l149b5oOEf1 D6kGexkYfzRE7NtDt39zKAOVP7DUkPhv/af4HiyVmLNX9XLa/9qKq08Nx9sfVoQUA5/d SFkctpOFmIau/t0WDU307NLfNrgSQM4QBM7Ru0eB7SxV6dKnS+XT0UrcW/ReT8p4kMwb vx2RUuzWPWEDFbhXIS2+uO6XslglZcnkGD3E6zly6OZUEC+zEkoVNWH3qK+OFs1Q4GgG y3IJ95xFTRCdZXK1Mbu0hcNZ665L/N60qBRJSDq+EpzcHQJEH06S427mwL/nPs5Ij2da CjgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8pLUppRx9V+9OWkCGAQJH9Dn1/c6ZimgOvW6Eu+L+/I=; b=GGb6hH60E9mEK6iy6PJn1X+D25oouzVugFSiuSSUDrKYq4luN1maBvO3v/9RjyiF7X gJKP3iOa4cyoW6uGnOo7Ba+am/Ka5P45RkBxkkBv0oWptL53KFGag3PKsOY06ZasDpQF EzMFL5rUzTE7OqqJBjF0LBQlFXyALij0jXJnxhlBlPYCBsRwJxCYjnxqXsPyOwKsRqPO 6J7xzCj0jod7Zb+QnApJEvR4crbLiqcVO35Fy3Lnip2UtcOLbDIQ+X9UFEcx7lBpR5fj fQr/Pcq3ZGKiRcExIa6J5/nKoSK8YnW19C4d3dWS2ZwYgMEwp1K/5AOa8ft2JL1hnwgW X0Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ahcXR5SN; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c10si3037251eds.107.2020.04.30.07.09.51; Thu, 30 Apr 2020 07:10:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ahcXR5SN; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729024AbgD3OJi (ORCPT + 99 others); Thu, 30 Apr 2020 10:09:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:60446 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728187AbgD3Nvr (ORCPT ); Thu, 30 Apr 2020 09:51:47 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F0266208DB; Thu, 30 Apr 2020 13:51:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588254706; bh=zO7R679Gr2AtMhtzxEms+JbhQBtZBn/rOHFwp6nT9xc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ahcXR5SN75w+Uu5qJlIPaUVEtgP83DiXg+5sw04SnNcstAbhyAWBclP7YqnJhrEgT TKFxO4pFN1yl6LBxnX7EflD6L/bskFn7Xi1qkeggOYJYz2Oqc0uMVpYu66JjsYVUmK oQvy7oeuA86KmO0NI1NxjtjZscumKfM2G0MwT648= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chris Rorvick , Sedat Dilek , Kalle Valo , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 55/79] iwlwifi: actually check allocated conf_tlv pointer Date: Thu, 30 Apr 2020 09:50:19 -0400 Message-Id: <20200430135043.19851-55-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430135043.19851-1-sashal@kernel.org> References: <20200430135043.19851-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Chris Rorvick [ Upstream commit a176e114ace4cca7df0e34b4bd90c301cdc6d653 ] Commit 71bc0334a637 ("iwlwifi: check allocated pointer when allocating conf_tlvs") attempted to fix a typoe introduced by commit 17b809c9b22e ("iwlwifi: dbg: move debug data to a struct") but does not implement the check correctly. Fixes: 71bc0334a637 ("iwlwifi: check allocated pointer when allocating conf_tlvs") Tweeted-by: @grsecurity Signed-off-by: Chris Rorvick Signed-off-by: Sedat Dilek Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20200417074558.12316-1-sedat.dilek@gmail.com Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c index 0481796f75bc4..c24350222133d 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -1467,7 +1467,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) kmemdup(pieces->dbg_conf_tlv[i], pieces->dbg_conf_tlv_len[i], GFP_KERNEL); - if (!pieces->dbg_conf_tlv[i]) + if (!drv->fw.dbg.conf_tlv[i]) goto out_free_fw; } } -- 2.20.1