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,URIBL_BLOCKED,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 0E32FC28CC0 for ; Thu, 30 May 2019 03:43:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D28B724C56 for ; Thu, 30 May 2019 03:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559187825; bh=bppTzBxoO9Ue7WR8F4rWlFuDGJvLkjrVlQGw2T/vVjs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MXS6u0BUnwS2gsCh1dM30cPmk0OEVmWICujUCMPR7BQG6kap+fADKd6GjIR21yWov hAVnz31qMJ5e4AqFVoTxRme7KkzjPfLnc33UdBdVExuPfaS9VuwQja/r6GicNiuFXF wLcEwPthWrxfD4P0/KicLK27E8/h9d1S+kGgU+Gc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731224AbfE3DnS (ORCPT ); Wed, 29 May 2019 23:43:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:33182 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732469AbfE3DVI (ORCPT ); Wed, 29 May 2019 23:21:08 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 3A711249A9; Thu, 30 May 2019 03:21:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186468; bh=bppTzBxoO9Ue7WR8F4rWlFuDGJvLkjrVlQGw2T/vVjs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZW+7SGMosHbrqzOdj/ZS3WUGfPt464BY71E+5/AW1nvUDYA3zY+CrF0jFtJ7agIJF hSwcXIJJJb9nxVOnZsPTnlhH7FinFad8FzYF4olKYUHrZ/fokuIWIgoS8CNTJGb1Oi kINirgvbvBd2zc3iYDVyp3030pWrlIooTTTIW8Sw= 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.9 094/128] brcmfmac: fix missing checks for kmemdup Date: Wed, 29 May 2019 20:07:06 -0700 Message-Id: <20190530030451.578660109@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030432.977908967@linuxfoundation.org> References: <20190530030432.977908967@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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/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 530f521209728..8f8fe6f2af5b0 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -5374,6 +5374,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; @@ -5390,6 +5392,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