From patchwork Mon Mar 11 07:32:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 1054193 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=umn.edu Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=umn.edu header.i=@umn.edu header.b="Pf6rZ2+w"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44HqZP2sHBz9s47 for ; Mon, 11 Mar 2019 18:32:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726897AbfCKHcl (ORCPT ); Mon, 11 Mar 2019 03:32:41 -0400 Received: from mta-p7.oit.umn.edu ([134.84.196.207]:47222 "EHLO mta-p7.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726682AbfCKHck (ORCPT ); Mon, 11 Mar 2019 03:32:40 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id F3026B05 for ; Mon, 11 Mar 2019 07:32:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p7.oit.umn.edu ([127.0.0.1]) by localhost (mta-p7.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 746VXyMIf0XA for ; Mon, 11 Mar 2019 02:32:38 -0500 (CDT) Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p7.oit.umn.edu (Postfix) with ESMTPS id BCDC883C for ; Mon, 11 Mar 2019 02:32:38 -0500 (CDT) Received: by mail-io1-f72.google.com with SMTP id a9so3517859iol.6 for ; Mon, 11 Mar 2019 00:32:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=CM+4RBks3zB8YoMv1kToRz9kjid3SKHwPTdosXxlMMQ=; b=Pf6rZ2+wVJl1u83ZrPv8+Y3fPITKkQJu83onS0XZJvTGeVhuummygSfhZYoXaVYga8 eDFM1LC+ARoVcaCwnaXP6ZCqcDGM27Aw/jRMRbOvxnI3XwF0ECQCmji5uBME5nPFeJmS ezr77Y8xpH9cbWKkoX9D5XogZCQ0viG8cjZfUrZTMATBMKKSASbU7MtJ+j/2zJlHBze4 uaJ1ouvMnCSnlL0oNZUPkKzOI2RNrIgl2ZjK/YhqNcO6h9eOCoeIDcLag8aO8vz+bXtE veQF04ExJGlT3z2rnUM9iO5TQHwGFxeFVHY2zUG4xo7piF/lU41bcce9yRqIp2WHAGrR iC/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=CM+4RBks3zB8YoMv1kToRz9kjid3SKHwPTdosXxlMMQ=; b=OwPan9xo9h0pNVufRMtR5EQKu22TsoYpSoZP5BWocVttMd5Jh7m9WaFTJ+0RXTGsJ3 h6H0A057U0ZSGOC5E7jdRnVZNo2RvKkACW1UQMNAQ1lzNmpvvRHrAT1uhXwnHQoJ6qFO 2DUy/6AEUv16CUlPNM6ja76pRUp8Ufbai9FqzsdQXs2u2oANJe4CoYh9+Q55pZK0rO7i nRo5tihDrGjKpQ+eDsyPI3mGOHFjQYytfUgWqXrjTwkqnTAUmjGbxQYpAF35WlCeJzFb Q5mTVu804Ih/hEg7wuZ9fJDfImrRtiMiVz98cw9w+9C46/FDF6Eot7FaAXRdaskSgxLd JP3w== X-Gm-Message-State: APjAAAVOfVjfIpqFXEI3rFpxjsPn4WUOfyAf4s2FpQEgsysxTmNXxQhg 7Y8pcndUqit8w6MGpSdp9M/YsLUheTGGgjnYn5+m8APcZN8IOFea12gWw+Yy/Remx7cgxmmZVsr 2PGUDpSUAp+7X0CzUdGIL X-Received: by 2002:a5d:848b:: with SMTP id t11mr14549776iom.270.1552289558379; Mon, 11 Mar 2019 00:32:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqy2IlAuIJDZJ4VVzbYlX0bdyI2uAAPSg7dw5V/E9C3/RZPFfmhxbtJNnhBtgejDrY2IdxUfbw== X-Received: by 2002:a5d:848b:: with SMTP id t11mr14549767iom.270.1552289558135; Mon, 11 Mar 2019 00:32:38 -0700 (PDT) Received: from bee.dtc.umn.edu (cs-bee-u.cs.umn.edu. [128.101.106.63]) by smtp.gmail.com with ESMTPSA id q2sm359638ioh.4.2019.03.11.00.32.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Mar 2019 00:32:37 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, Arend van Spriel , Franky Lin , Hante Meuleman , Chi-Hsien Lin , Wright Feng , Kalle Valo , "David S. Miller" , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Stefan Wahren , Chung-Hsien Hsu , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, brcm80211-dev-list@cypress.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: brcm80211: fix potential NULL pointer dereferences Date: Mon, 11 Mar 2019 02:32:30 -0500 Message-Id: <20190311073232.30807-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In case kmemdup fails, the fix returns -ENOMEM to avoid NULL pointer dereferences. Signed-off-by: Kangjie Lu --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index e92f6351bd22..d903a45e7b68 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -5464,6 +5464,9 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg, conn_info->req_ie = kmemdup(cfg->extra_buf, conn_info->req_ie_len, GFP_KERNEL); + if (!conn_info->req_ie) + return -ENOMEM; + } else { conn_info->req_ie_len = 0; conn_info->req_ie = NULL; @@ -5480,6 +5483,8 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg, conn_info->resp_ie = kmemdup(cfg->extra_buf, conn_info->resp_ie_len, GFP_KERNEL); + if (!conn_info->resp_ie) + return -ENOMEM; } else { conn_info->resp_ie_len = 0; conn_info->resp_ie = NULL;