Received: by 2002:ac0:a874:0:0:0:0:0 with SMTP id c49csp286645ima; Fri, 15 Mar 2019 02:51:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqyTr/HRPAmO5ng2gvVwGtEuU1NWzyKMEke7PNa2Kc3nQ3jDXJxP+lI8LfAyWgoWgiywtbhE X-Received: by 2002:a17:902:8c8b:: with SMTP id t11mr3225426plo.148.1552643514363; Fri, 15 Mar 2019 02:51:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552643514; cv=none; d=google.com; s=arc-20160816; b=Ptg4DBituJLojNfgltKJQ7Qh3Z/iv29Zq4eXsYVVeGEnpiC6gSViKTRGA/MOOSOLw0 8nA5mz46xqEnTaqp8jtHQRey4Zk+oIVjMiqCoUNUSsdBMd9aumrmCvol48jlT8ZWBV5O pLQSt/+bivG1bZA2ZIbQYdUGpCpg1+nK6rVbPcfrIEABantO4vRnO0GGgWS96WE7vOrd IbsutgX6kNu21kppETQS+FgGwt7K7rp9PH7880ansWGICbdZNMnf11eWHpKnesZBQlNG cdU8nxq5q1t4aVD14rjm363QlGWBupDx8CLvpNoa4klxdLlEXuSQzdWTvF46gfejU0C7 AYSA== 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 :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature; bh=N2TmsKXbvDGU0X42ituryieWnNgh/sDH4QOuRfO6NR0=; b=ivbiojQZsMPEuv8YuC3BFh1rv/g53HfIdiYLM5Bc68auZGhSf1BmECfQC3kPO2senZ 5hFVcRb7QVHVEshFRPjX+nzJtGbtCxNmvPpwvouU/ee383++hA+BhWFGqWl5KwByQZQb 7hL92TtdUKTfoKXZDAGDos/ZXtPjT5fvVIRBY01buOFeRGlQEY/jJnNriKqt/IegUb4I ORm9thSnwrpk2s2FHdefKZAdJEr0GL85795XkMDEnurdHS1hdPklXKag1xfZSzENP7Mq NMoLz0Y1ktExwYLjNqllhPiGACk1AZlLv5YN0hFhJlzu18+hxJsiOFv/Ydi/TbGuqE0/ 9wow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@broadcom.com header.s=google header.b=d5SswaQi; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f131si1586070pfc.92.2019.03.15.02.51.39; Fri, 15 Mar 2019 02:51:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@broadcom.com header.s=google header.b=d5SswaQi; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728800AbfCOJuu (ORCPT + 99 others); Fri, 15 Mar 2019 05:50:50 -0400 Received: from mail-yw1-f66.google.com ([209.85.161.66]:45510 "EHLO mail-yw1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728718AbfCOJuu (ORCPT ); Fri, 15 Mar 2019 05:50:50 -0400 Received: by mail-yw1-f66.google.com with SMTP id r188so6729376ywb.12 for ; Fri, 15 Mar 2019 02:50:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=N2TmsKXbvDGU0X42ituryieWnNgh/sDH4QOuRfO6NR0=; b=d5SswaQi/ccEEQTezLipe2b1d2URO5vZOCV8pJJJsqT3bZtdYN/FRum9RFXp87a5Eh SK8iZYsqQ6G7UFz9M5ztwVeQZyLYb28LIekch3hRvgZjkppLtVL9dDIcBGHRFFXtlKjh uE/m9tl6XqOmGnxJOddeNYhfsfKT8o/702AI8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=N2TmsKXbvDGU0X42ituryieWnNgh/sDH4QOuRfO6NR0=; b=qiRVTmk/+kzSkZ9g2rSmQZCvp8GSXLQG3qq/fwz7DSzAkMR+tf67r+SJbnuqsRAPtD 6MRhwgMqTHLw+rknmallaa8umrTnz1MJjhKGBzn43Q9O4EYD7XmsY11Z51mONj+PaWeZ y/6baKjc+jEMCCWIbo99VkyULH8j5gBtZ39WCc+53d20jghEDUwujqzSLhbGBhLgHueO jNFkfq6QCC5Wi0c3wwqdz4hwzet9gSpm5yKWzh9sCarNzUSZdeemphkAvKLNhR0IRpUD LAOqJGutPZmDHFk+Pr4mN3u7HZ37UAjkbALVEHV6RktGtG0r8VzFU2gu+OPbJTgv+Xuh fATw== X-Gm-Message-State: APjAAAWukKX7lBf290BXwww2taM09XPukQecNmOKKEXAxgrqpBT7unO+ EbiU3kiwR/FHeJTMBffvAOEyNj1LpbXx77IdILvJA/y2qdj9gN1EsfrlAQpwR61dD4a7V7oJe/O abm8rAK0uQV1qtUZ4Dxat8ildmMYx5JJQCdjpGMYHsU80OSXRmj8GdjIj19wwhWLp34EesOAK95 7Nq5cC6+at+V0= X-Received: by 2002:a0d:c5c3:: with SMTP id h186mr1946124ywd.462.1552643448591; Fri, 15 Mar 2019 02:50:48 -0700 (PDT) Received: from [10.176.68.125] ([192.19.248.250]) by smtp.gmail.com with ESMTPSA id 81sm652526ywr.21.2019.03.15.02.50.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Mar 2019 02:50:48 -0700 (PDT) Subject: Re: [PATCH v2] net: brcm80211: fix missing checks for kmemdup To: Kangjie Lu Cc: pakki001@umn.edu, 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 References: <20190312043929.727-1-kjlu@umn.edu> From: Arend Van Spriel Message-ID: Date: Fri, 15 Mar 2019 10:50:44 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.3 MIME-Version: 1.0 In-Reply-To: <20190312043929.727-1-kjlu@umn.edu> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/12/2019 5:39 AM, Kangjie Lu wrote: > In case kmemdup fails, the fix sets conn_info->req_ie_len to zero > to avoid buffer overflows. Hi Kangjie, See comment below. Also for v3 change prefix 'net:brcm80211:' to 'brcmfmac:' instead. > Signed-off-by: Kangjie Lu > --- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c > index e92f6351bd22..5d9a3c35fef5 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c > @@ -5464,6 +5464,8 @@ 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) > + conn_info->req_ie_len = 0; good. > } else { > conn_info->req_ie_len = 0; > conn_info->req_ie = NULL; > @@ -5480,6 +5482,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) > + conn_info->req_ie_len = 0; bad! I think you took my comment too literal. Here it should set conn_info->resp_ie_len to zero. Regards, Arend > } else { > conn_info->resp_ie_len = 0; > conn_info->resp_ie = NULL; >