Received: by 2002:a05:7412:8521:b0:e2:908c:2ebd with SMTP id t33csp679304rdf; Fri, 3 Nov 2023 11:34:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGDe8ZzKQWPV4sMxaAE7OWaEaNDpZyVfcTF5BonSA1ZILwA6KkzdD+i10nCQGTKfyCgzFbh X-Received: by 2002:a05:6a20:430d:b0:171:a2df:4e68 with SMTP id h13-20020a056a20430d00b00171a2df4e68mr23227934pzk.36.1699036476193; Fri, 03 Nov 2023 11:34:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699036476; cv=none; d=google.com; s=arc-20160816; b=u6VYkESPMbQa6cAYP2B2Xpc+zsJheNXmy12MGj2rRTJvjqe+Jo0fC7tz7DMmn9UL1E nU1jTu6OHbJYJGCwdRAu1buE2NrnsGE4mCciBMnG9iInsnTD+3euYa19hFTvC4RJuQmq eBwNyjA3zezzvwKy4QskcV3bAi5Hg7GOfLb1aVEHuaHRiQhmhcpzeHj90Naulbca+69y QQsulyvtcGkfMnA3rgBA3FYnTPjl+C2SllfDQvKWM0vRHbw5m12Wvtd+GCdilU4OA0eP hVGXP38Y+WvWoyK0fGzZi5lSfgn9VwI5s73QYQnSdcTstEiKbOhfh54w5pU+/ujq3DFG Y3Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=TdLPAGJ6pLW6qlWWDGIB+lf82YLJHRAfIEwP3jwJypY=; fh=3+MZSviEfux2MK29CzRf+ui9X3WIKbSdvK9U10pIUrk=; b=J5GuJg4yD+qUoWiqQlYm+kmmtL+MX5iMbF53E5dvut5kWH99KqsCRMtuT0yuYvX1nv IZQwYRwQB6IicffVvwjjsk4Bqs5+gZDXsl8dQoqe2zHLzJ+CIUdLHc0Nlra5d0ryHBMD FM/AdK2g6SZBLcU2frTXzwLWhQFQWlrsU7THZ+kTeWlLWHpx3hkHbxxvodryJtzSrlYu 2diNa8aDggBwsVVFusds/WacHKVMHP9oafOoa7FK7WHZ2znukPJAgRxwHlCzz0Unsnk7 /50XcRW7vjVV2dm8QK1sOtlgyIjega/r0TPdlugaxzISs+bnnJjN3+aB2LC5S6Q20u1Y r0eA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FyM320pe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id h4-20020a170902f7c400b001c9de48fc7asi1990280plw.170.2023.11.03.11.34.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 11:34:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FyM320pe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 92EBF83C1E0D; Fri, 3 Nov 2023 11:34:05 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345150AbjKCSdu (ORCPT + 99 others); Fri, 3 Nov 2023 14:33:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345177AbjKCSds (ORCPT ); Fri, 3 Nov 2023 14:33:48 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64150D47 for ; Fri, 3 Nov 2023 11:33:37 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E749C433CA; Fri, 3 Nov 2023 18:33:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1699036417; bh=GCcviAr0J+IVeM1/p5MQ4ex6AHZgCCmGit6AtH3K05k=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=FyM320peA+QJM3iwPOVx6aexI+At1jmo+xGow9tXL1dH6z/biHMdoS+afNaGl1mSa H559T8yRhyt/BtwSnyLPNC+nzAAPis18jy9AaJTiXUw12ij6GM5PApK80g7lY7mcT/ rxtzhYNEuT14oqiJl2oi5vH8irjBNVvM2kjqmum0= Date: Fri, 3 Nov 2023 19:33:34 +0100 From: Greg KH To: Justin Chen Cc: Yuran Pereira , davem@davemloft.net, netdev@vger.kernel.org, florian.fainelli@broadcom.com, linux-kernel@vger.kernel.org, edumazet@google.com, bcm-kernel-feedback-list@broadcom.com, kuba@kernel.org, pabeni@redhat.com, linux-kernel-mentees@lists.linuxfoundation.org Subject: Re: [PATCH] Prevent out-of-bounds read/write in bcmasp_netfilt_rd and bcmasp_netfilt_wr Message-ID: <2023110318-utensil-figure-eb80@gregkh> References: <2023110301-purist-reputable-fab7@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 03 Nov 2023 11:34:05 -0700 (PDT) On Fri, Nov 03, 2023 at 11:23:16AM -0700, Justin Chen wrote: > > > On 11/3/23 5:57 AM, Greg KH wrote: > > On Fri, Nov 03, 2023 at 05:57:48PM +0530, Yuran Pereira wrote: > > > The functions `bcmasp_netfilt_rd` and `bcmasp_netfilt_wr` both call > > > `bcmasp_netfilt_get_reg_offset` which, when it fails, returns `-EINVAL`. > > > This could lead to an out-of-bounds read or write when `rx_filter_core_rl` > > > or `rx_filter_core_wl` is called. > > > > > > This patch adds a check in both functions to return immediately if > > > `bcmasp_netfilt_get_reg_offset` fails. This prevents potential out-of-bounds read > > > or writes, and ensures that no undefined or buggy behavior would originate from > > > the failure of `bcmasp_netfilt_get_reg_offset`. > > > > > > Addresses-Coverity-IDs: 1544536 ("Out-of-bounds access") > > > Signed-off-by: Yuran Pereira > > > --- > > > drivers/net/ethernet/broadcom/asp2/bcmasp.c | 4 ++++ > > > 1 file changed, 4 insertions(+) > > > > > > diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethernet/broadcom/asp2/bcmasp.c > > > index 29b04a274d07..8b90b761bdec 100644 > > > --- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c > > > +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c > > > @@ -227,6 +227,8 @@ static void bcmasp_netfilt_wr(struct bcmasp_priv *priv, > > > reg_offset = bcmasp_netfilt_get_reg_offset(priv, nfilt, reg_type, > > > offset); > > > + if (reg_offset < 0) > > > + return; > > > rx_filter_core_wl(priv, val, reg_offset); > > > } > > > @@ -244,6 +246,8 @@ static u32 bcmasp_netfilt_rd(struct bcmasp_priv *priv, > > > reg_offset = bcmasp_netfilt_get_reg_offset(priv, nfilt, reg_type, > > > offset); > > > + if (reg_offset < 0) > > > + return 0; > > > > Shouldn't you return an error here? > > > > thanks > > > > greg k-h > > As long as offset is less than MAX_WAKE_FILTER_SIZE we don't need to worry > about error checking. This is already checked before we call > netfilt_get_reg_offset() in both cases. Instead of returning -EINVAL in > neffilt_get_reg_offset() lets return 0. This will silence the coverity > check. In practice we will never hit this logic. Then don't change it, coverity is incorrect here. greg k-h