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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 A1076CA9EC9 for ; Mon, 4 Nov 2019 21:51:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A9F42190F for ; Mon, 4 Nov 2019 21:51:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572904284; bh=GlhZ2HzOLMzQhFoybuhn7NpPMhBIK64mRol5aXbkL/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=K/k8+zCI4UAKVQGXZ+w3eVSMNV9Bg1lniqW613Pm1aEw9RBCFyL+uOmJHiDDJLJAi zn3Wut6IRDw4x/yz0CDQziXAQjmo9Ke0YEsSlzDSCqd0VP3HgRaa1QrnA1sSq+zcp7 xkbWW0utUcieXO77g+goawq4YS8gPMDHtnYQXAXw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730496AbfKDVvX (ORCPT ); Mon, 4 Nov 2019 16:51:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:44350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730480AbfKDVvW (ORCPT ); Mon, 4 Nov 2019 16:51:22 -0500 Received: from localhost (6.204-14-84.ripe.coltfrance.com [84.14.204.6]) (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 36BE0217F4; Mon, 4 Nov 2019 21:51:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572904281; bh=GlhZ2HzOLMzQhFoybuhn7NpPMhBIK64mRol5aXbkL/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b/KVFWXAS58Gxq3oTynLLMsFr/7SbAPpmoOdrlgJAZojuvBUMBAJ1yL3p4gN44kjm jP2j2BshAqKoXz8r8VIyHWOFoQqSH8ooY9eDBwvrE3LDiHg9Y81k/zQZ/Wonlpyc2/ X+CURBS3VDHD7d/8rNFt2Vbmm4aU4pioglWQnX2M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicolas Waisman , Laura Abbott , Ping-Ke Shih , Kalle Valo Subject: [PATCH 4.9 49/62] rtlwifi: Fix potential overflow on P2P code Date: Mon, 4 Nov 2019 22:45:11 +0100 Message-Id: <20191104211951.566497653@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104211901.387893698@linuxfoundation.org> References: <20191104211901.387893698@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 From: Laura Abbott commit 8c55dedb795be8ec0cf488f98c03a1c2176f7fb1 upstream. Nicolas Waisman noticed that even though noa_len is checked for a compatible length it's still possible to overrun the buffers of p2pinfo since there's no check on the upper bound of noa_num. Bound noa_num against P2P_MAX_NOA_NUM. Reported-by: Nicolas Waisman Signed-off-by: Laura Abbott Acked-by: Ping-Ke Shih Signed-off-by: Kalle Valo Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/realtek/rtlwifi/ps.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/net/wireless/realtek/rtlwifi/ps.c +++ b/drivers/net/wireless/realtek/rtlwifi/ps.c @@ -770,6 +770,9 @@ static void rtl_p2p_noa_ie(struct ieee80 return; } else { noa_num = (noa_len - 2) / 13; + if (noa_num > P2P_MAX_NOA_NUM) + noa_num = P2P_MAX_NOA_NUM; + } noa_index = ie[3]; if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode == @@ -864,6 +867,9 @@ static void rtl_p2p_action_ie(struct iee return; } else { noa_num = (noa_len - 2) / 13; + if (noa_num > P2P_MAX_NOA_NUM) + noa_num = P2P_MAX_NOA_NUM; + } noa_index = ie[3]; if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode ==