From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0BF4FC28EBD for ; Sun, 9 Jun 2019 17:02:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9CFF207E0 for ; Sun, 9 Jun 2019 17:02:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560099755; bh=686SSMPvEly1ZMRZ/jVIWFcRCcgs3YT3Au7KYDm5TgA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=td+Enr88xJ+hEk+YdL0BoiHaGQv2Z3vERbKVPLQ1SmMoGZG0Uof0g1GtFadit86a3 WiYapq7+agD5kJU+/4PivoSyEZheW+JYk+YcrRLui0RCZ3+vnvmSgAl7K5Iyk1U8FZ ndZ4b/f1ow/KURwnTntc5dvjY9tW6w6cc/KX8eR4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388263AbfFIRCf (ORCPT ); Sun, 9 Jun 2019 13:02:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:40334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388239AbfFIRC1 (ORCPT ); Sun, 9 Jun 2019 13:02:27 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EFF2B206C3; Sun, 9 Jun 2019 17:02:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560099746; bh=686SSMPvEly1ZMRZ/jVIWFcRCcgs3YT3Au7KYDm5TgA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=taiSgzbLKmoiZXRRmZT/Ws+uGI7TkTXP89QsX0/41GXP4R6KX4dKzSSzBGit6OsdK 39ZO8I+8Tanec9/hFEoSiif6yZsUcliem89H8PUV0ryaYmJNdQuOl05p3Ie5Jf4k1t zAnfeYP58rPKwQaGv8MBLnPVpPO4xTNPF8fw1IlA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kangjie Lu , Arend van Spriel , Kalle Valo , Sasha Levin Subject: [PATCH 4.4 152/241] brcmfmac: fix missing checks for kmemdup Date: Sun, 9 Jun 2019 18:41:34 +0200 Message-Id: <20190609164152.161050646@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190609164147.729157653@linuxfoundation.org> References: <20190609164147.729157653@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 46953f97224d56a12ccbe9c6acaa84ca0dab2780 ] In case kmemdup fails, the fix sets conn_info->req_ie_len and conn_info->resp_ie_len to zero to avoid buffer overflows. Signed-off-by: Kangjie Lu Acked-by: Arend van Spriel Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c index ad35e760ed3f0..e3f5dacd918d7 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c @@ -4836,6 +4836,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; } else { conn_info->req_ie_len = 0; conn_info->req_ie = NULL; @@ -4852,6 +4854,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->resp_ie_len = 0; } else { conn_info->resp_ie_len = 0; conn_info->resp_ie = NULL; -- 2.20.1