Received: by 2002:a05:7412:8521:b0:e2:908c:2ebd with SMTP id t33csp454900rdf; Fri, 3 Nov 2023 05:57:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHkxwpN8pMzWfQIO8hvsNWeM4CihK7GkJ/RVI6qr9qpu+pFOBuL/go9p+0YdmvsOgJm9aQW X-Received: by 2002:a05:6358:c82:b0:16b:3cc0:4fa4 with SMTP id o2-20020a0563580c8200b0016b3cc04fa4mr4378595rwj.30.1699016245155; Fri, 03 Nov 2023 05:57:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699016245; cv=none; d=google.com; s=arc-20160816; b=WlEa/sNolF5TBaSvrU5aq9bi9iL5c6ZoY1YK+xy356q0XJrL9CJTq121JuftviKqbL cCrLH2JGQjhkW79lcb5ngW+JjFXiHDV8DOlYuueBuVZyQ1hgO3NIlS+/qsTnX5l2Yh03 mObxw5aFPztY8areqoMUhdyTiv9KqD1wGCZhGctIi6DzJmAvG81dbZ6eNzA+4xYSYmHH ZDMAVGQjrjtaW9mHn13dxFX+Jb9q0OMVPbFiRBrqz6onW9v5HzZg4eEHlU98GGgGV7ix 8s3QcewgmB4SFr86sf/L/2N3jfqRrnXJ6mdhTpNPnUDIKVXM7wIDgJ3A9MMcHQlyDVV3 VAqQ== 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=pbh7gF3PCO8XhWkrLcse7X2ahowQzYh6+5K6RfyA0Co=; fh=siVIVu+9K7ICDe+QvsWuAMUXBi/+UR5n9Jxjtff724M=; b=Oiv3xVw31s0uHQpz3sGTb1aBCPhhxHbzyPznd+hM8Ga6DaJp5saXEG2B8XuU54wTuD 6cwaqV09r6eSDGsyGs6Z46ZxNIi5ijf7N3Ni+xrUACM9FKkpLLhTrFS9eJgja/7BHf8M oJzxYOYsrJRdy3BzI+bpd2ogSZXROxRNlEIA4nbmy0HYmFsUyD6+Si2y7MWrWfUb9Rzh +j4pDEKE0AAVabbN+AV4ZqvvESkApiZwLVkiRZZVOnhHSMJR08spY+GZb2yK2rbJVu0s dU7+olkSyXxcmGU0WpWa9N/6VnjGrqXwKw1j6a5RE+wXwMc+ToJp7teQFyHQG3tmH83Y qKcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nToruN3x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id h191-20020a636cc8000000b00565db2812a0si1480429pgc.60.2023.11.03.05.57.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 05:57:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nToruN3x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 BB01981B6AA0; Fri, 3 Nov 2023 05:57:23 -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 S230108AbjKCM5X (ORCPT + 99 others); Fri, 3 Nov 2023 08:57:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229790AbjKCM5W (ORCPT ); Fri, 3 Nov 2023 08:57:22 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA53E83 for ; Fri, 3 Nov 2023 05:57:16 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BA855C433C8; Fri, 3 Nov 2023 12:57:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1699016236; bh=Z4GRd0KC2ISywGcPf/cNtZiFl5y4kqZBVx/tBDTs7UE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=nToruN3xBPwHT7q+LbTARIMHGepo2OT9MGLynrmTvE1MVVtD4JrzpvjyZI0k2tMXU L8/l12OKmkFdt4SEQtmhXbbM+GSmJYkZEO4XHGAOQPwRoiY/IX6kL6Tw2YnRZf41VS BRGgalmr0TqJwJI7LfUoaH/1WgufMVPsljEvDXjA= Date: Fri, 3 Nov 2023 13:57:13 +0100 From: Greg KH To: Yuran Pereira Cc: davem@davemloft.net, netdev@vger.kernel.org, florian.fainelli@broadcom.com, linux-kernel@vger.kernel.org, justin.chen@broadcom.com, 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: <2023110301-purist-reputable-fab7@gregkh> References: 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 05:57:23 -0700 (PDT) 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