From patchwork Wed Sep 6 09:21:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hangyu Hua X-Patchwork-Id: 13375417 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 097B5EB8FA5 for ; Wed, 6 Sep 2023 09:22:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Z/hVpGJbAMLDPc73y3OSLDdD8HUC/ZkZUaT8B7VJ2wA=; b=rSIzUkXuHYv31N sy3XZKLxxFL/W9gKRrVwoteBbKnSjDIgpEZUtDsephTTupXhuMio2fDoL6z9QVEl6UeauJA6S/t4z +3WbtYbGN//gSeoLzAV10uKkPeQKxP3O/sfWlGJilvy28nmSZ6/T4/U7eDymolxTi5B0QFg9UDm9y kozP1aKwqGYHC7a3qnCmGT/fvn/BmMXet8wGWE4W3XdEWdbN/cypgE4Zu3mhxr3XUIjEkxDfcWqCU x3dnPvoIx5zDioM/NwQprQcbsK5NEO6ajgXhNOSdvyIXy/NKOQOWCR5SAW07LqQMHlW82TpECIQ3t JzufnpWN9N72pATFgS+A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qdojw-007tkt-2G; Wed, 06 Sep 2023 09:22:24 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qdoju-007tjj-34; Wed, 06 Sep 2023 09:22:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=Fn+jXRrDrAEw7CfX+G9Zj1hLr/gSQRyi9u7mHipUA4E=; b=WB6AK/MwWCyQGYEDavMnE0Lgbx q9F9FJdmkWBqCBroRzq6Iso4oCb1KwoCTFtCZv4qOcC+ztJEQfrSBmnYPZgS7LK56SLS78HheHWjF OTxs2HViWJQ0kO1GePftt94+RofPsSTLdXkgWmpFKy3kNZfUdZtmr/vwyEowAsmMKP+yV4EIXssnq lf49TVsteVkQ7FSW24gPAmcmDB7NbU+Um3HqslD+cbcVd3EezvGU5CXYx7Q3gJHGfaPQrE2qtfFKF OM0c1ZiZxnWvSncnVAzSTuBKoFps9RCJseIbPriPwDAd9nOnn9N5088eoT+zmJwjtsBV3Ew9XGh8o jsPM0N5Q==; Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qdojm-0010l7-2Z; Wed, 06 Sep 2023 09:22:21 +0000 Received: by mail-pj1-x1042.google.com with SMTP id 98e67ed59e1d1-2736e602429so723430a91.0; Wed, 06 Sep 2023 02:22:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693992131; x=1694596931; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Fn+jXRrDrAEw7CfX+G9Zj1hLr/gSQRyi9u7mHipUA4E=; b=CQVhO2ffxhfQPoWlY6vvOA/pEz3sX1l2I4gIahWPJSnAuzhS6LbJ3owpBpoUbUx2d4 DyMDsM9a8Um25PrpJyYE6Nq2C2Xs6KZeb6cWXx8RRIP9ggbYvpz9V1CWGszk/YOEmTt1 +GTpm/OqTDJaLWbPWIoAMzy0jzoWLWYYJt8zXWFUF2VmfxuEtcQ9W3F++u3IX/8jCz4W dGLp5Mt/m2PE6f4CaF92vAk46BUaCONwQEQdxcZ7BkdxJE8dU3yGHQJvyHQnDwWTMB+E EfNRzRANJdMBxdcqAzEBemfIWwWlQqBUqv4Kc6CSrnmIBECjxCSMHUMsPrGNFFTX58+h Z+kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693992131; x=1694596931; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Fn+jXRrDrAEw7CfX+G9Zj1hLr/gSQRyi9u7mHipUA4E=; b=iubRjrX1OpWFOvNHTQkrqJj4F4rOC0daJ2zTK4pqySNbaxqED6JS37CHPRChk5lq6z uaXossIDik/YLH2UPGKVGVWyXHCDlPPM+RkBpfP/bo6BeWQ4NIBCYUfOo5XnwvIZTwU0 UYpPkvY3ZXiwMK9C1Wf3av47Ywdc/LofknubQkEEf6wCvIXFLmHQi0r7jo2+iP8CoNNs rxnBQF7xL0XeCJ8jhhqBPYO+4Q4fgZO8lTqBsgQEvUD/RGkhEyKnTokH/EaM9HK0peAI Ga7pREejpFhFAtSiCFqqwTiyT3QnpN4s5crbN977GI4XF04TI9CV1tNjS2rN8Lk9/R1t gRZw== X-Gm-Message-State: AOJu0YyB/q9tRZnTJ94s5I1BF5OM24luQNMyjalFE0+fHxBN493kxraG lYL+vB3+o5YZUElNZRJVt3I= X-Google-Smtp-Source: AGHT+IFOd5uWXjG5sRVrnc1uN2B+x7New4jEPSE8eT/hxhjfSvF95rsX2Pmpq4DVWgFU4xsFEmIoJA== X-Received: by 2002:a17:90a:4dc7:b0:263:2312:60c2 with SMTP id r7-20020a17090a4dc700b00263231260c2mr13836784pjl.3.1693992130736; Wed, 06 Sep 2023 02:22:10 -0700 (PDT) Received: from hbh25y.mshome.net ([103.114.158.1]) by smtp.gmail.com with ESMTPSA id ft15-20020a17090b0f8f00b002684b837d88sm10679242pjb.14.2023.09.06.02.22.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 02:22:10 -0700 (PDT) From: Hangyu Hua To: justin.chen@broadcom.com, florian.fainelli@broadcom.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mw@semihalf.com, linux@armlinux.org.uk, nbd@nbd.name, john@phrozen.org, sean.wang@mediatek.com, Mark-MC.Lee@mediatek.com, lorenzo@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, maxime.chevallier@bootlin.com, nelson.chang@mediatek.com Cc: bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Hangyu Hua Subject: [PATCH 1/3] net: ethernet: bcmasp: fix possible OOB write in bcmasp_netfilt_get_all_active() Date: Wed, 6 Sep 2023 17:21:05 +0800 Message-Id: <20230906092107.19063-2-hbh25y@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230906092107.19063-1-hbh25y@gmail.com> References: <20230906092107.19063-1-hbh25y@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230906_102218_246128_3C1425CA X-CRM114-Status: GOOD ( 10.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org rule_locs is allocated in ethtool_get_rxnfc and the size is determined by rule_cnt from user space. So rule_cnt needs to be check before using rule_locs to avoid OOB writing or NULL pointer dereference. Fixes: c5d511c49587 ("net: bcmasp: Add support for wake on net filters") Signed-off-by: Hangyu Hua Reviewed-by: Justin Chen --- drivers/net/ethernet/broadcom/asp2/bcmasp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethernet/broadcom/asp2/bcmasp.c index d63d321f3e7b..4df2ca871af8 100644 --- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c @@ -535,6 +535,9 @@ void bcmasp_netfilt_get_all_active(struct bcmasp_intf *intf, u32 *rule_locs, int j = 0, i; for (i = 0; i < NUM_NET_FILTERS; i++) { + if (j == *rule_cnt) + break; + if (!priv->net_filters[i].claimed || priv->net_filters[i].port != intf->port) continue; From patchwork Wed Sep 6 09:21:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hangyu Hua X-Patchwork-Id: 13375591 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 10D50EB8FB7 for ; Wed, 6 Sep 2023 11:31:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OU+4+f+1dOY7mVBXYfHSIw40H8BLY4sS67XZw5+f9pQ=; b=JPWzTMB8aZru2l 8fvJOUY15IZzVrULm6VYSBCxJJdIZO3Y8gifZRwPdooX5EaVvcqjOnc7K1GzmNiL1TE07MpsnxXTs LnmFxQRG6ukMZ7D0RnFlp8OgsZRXndYwX5AsxNoNeUwZzrUCAy2Gwm/ZzoCgfO4R+xKW9Xqj4gnAq RD9hF38Td8PPwRt1Rx67cooqHcKYZuR18UYXkX+L+aWYu8nABlUXGvnOo27s0ee5UQZ9UuPxARr78 8ysdkVGWFyfI5HoP+n/FcNOPofwH1Sj83JlEd+PULdVAbhIaEC3YCR822pG9YCv/wNI1fV4ZYoj5z eLUGuubK9ryH4bBEMNMg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qdqkK-008lwJ-2Q; Wed, 06 Sep 2023 11:30:56 +0000 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qdoju-007tj4-0k; Wed, 06 Sep 2023 09:22:24 +0000 Received: by mail-pj1-x1043.google.com with SMTP id 98e67ed59e1d1-2736e602429so723447a91.0; Wed, 06 Sep 2023 02:22:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693992140; x=1694596940; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EdlxO8xCKrQy/jRT0nkbbxVM9BFP+RkDY99mRvExc+k=; b=HQf+NOfOMlnTojshiHX+IVZdOc/Fy2zGEaKybJ+e/iDF9nUlbR3jNd0UzFZjZJ6SxJ ZvxfOD9QfUmtgrQw6DvKdqg5wp0hDKZLM8ksWcwLM5tr7eDrD3uWo2/KW6UjurhipcQK 0PcbC3VdpxR3G+FjOg+TwcJV74nk0PeNrR4GUDcDLUZiF+63cIXvLC5hHR/rjQJiAN6T 2JUvZc+JD5XTW32Wp3qgWP8Jwx3omUtikQmr4URIViQfgQ1I0nPx3vosPzu9czgKwST7 7BBK86f8Npl1qQ1XHvGZU7SO23FbX/ds2gmJu0VCMvfeFBV7SB9XZ79COcjlt8vnMpU3 barw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693992140; x=1694596940; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EdlxO8xCKrQy/jRT0nkbbxVM9BFP+RkDY99mRvExc+k=; b=BxscESKbG36GnNIWfct8sBLAGRVEK74YUvfQyVyLJN54c4goAQp6nELKkmn3JVmqax EaxTFda7sFra80G+vbwm7vsZCz5ZrWHht+BQDA7ZVtvu5u/N0t9kYnfIvZzRY1eAEZmt 78ni99UIS5CbnNy7A2/xjwtk8XZBedklLM+SHm0abzu1IxS8IgitbGvcJHL/plC1t/Nt 7MjpePO0GokbHGEJlwRF5+7tJvj/JM4VZIdhj6RyttC3NLnwLpqEkBzC2eKOeRYOYh4d PWVW15P1YS0RefIjq5S1SqaVcPJ5wX8g/x+RkVAvNvH3t074YMW0WhQ12oVUW+Vs+Z0I yCzQ== X-Gm-Message-State: AOJu0YxcHitjN3yZgAbRrr9n2UUGZ2Yv4U8/IAvUMXal5IlTuMsjuY+3 aKwVor2o1QdgdrHDZE3iCl8= X-Google-Smtp-Source: AGHT+IHMiYlrF3Jj3YOcK6rVl4xLdU7DgmAA3OTs/hdRqP6Fw6ddEdyaYMDL7Qb3ChEK1pnU2kkrAQ== X-Received: by 2002:a17:90a:7564:b0:26d:414d:a98a with SMTP id q91-20020a17090a756400b0026d414da98amr13879578pjk.1.1693992139631; Wed, 06 Sep 2023 02:22:19 -0700 (PDT) Received: from hbh25y.mshome.net ([103.114.158.1]) by smtp.gmail.com with ESMTPSA id ft15-20020a17090b0f8f00b002684b837d88sm10679242pjb.14.2023.09.06.02.22.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 02:22:19 -0700 (PDT) From: Hangyu Hua To: justin.chen@broadcom.com, florian.fainelli@broadcom.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mw@semihalf.com, linux@armlinux.org.uk, nbd@nbd.name, john@phrozen.org, sean.wang@mediatek.com, Mark-MC.Lee@mediatek.com, lorenzo@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, maxime.chevallier@bootlin.com, nelson.chang@mediatek.com Cc: bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Hangyu Hua Subject: [PATCH 2/3] net: ethernet: mvpp2_main: fix possible OOB write in mvpp2_ethtool_get_rxnfc() Date: Wed, 6 Sep 2023 17:21:06 +0800 Message-Id: <20230906092107.19063-3-hbh25y@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230906092107.19063-1-hbh25y@gmail.com> References: <20230906092107.19063-1-hbh25y@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230906_022222_297777_0609554F X-CRM114-Status: GOOD ( 11.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org rules is allocated in ethtool_get_rxnfc and the size is determined by rule_cnt from user space. So rule_cnt needs to be check before using rules to avoid OOB writing or NULL pointer dereference. Fixes: 90b509b39ac9 ("net: mvpp2: cls: Add Classification offload support") Signed-off-by: Hangyu Hua --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index eb74ccddb440..21c3f9b015c8 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -5586,6 +5586,11 @@ static int mvpp2_ethtool_get_rxnfc(struct net_device *dev, break; case ETHTOOL_GRXCLSRLALL: for (i = 0; i < MVPP2_N_RFS_ENTRIES_PER_FLOW; i++) { + if (loc == info->rule_cnt) { + ret = -EMSGSIZE; + break; + } + if (port->rfs_rules[i]) rules[loc++] = i; } From patchwork Wed Sep 6 09:21:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hangyu Hua X-Patchwork-Id: 13375418 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 74C50EB8FA5 for ; Wed, 6 Sep 2023 09:23:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vfBvVEAGZ2VFXw95DkCzia7Coc7S+YqNSDQdo6nfgF0=; b=n7tsZABhzXjyVA qLFwCzL6Cg1aW/qFME/5842Quj5scbvKGBDU9dMmjR8+rllAw+Jr9L7EhlVke6xjs8nVTg/Ugjmag m8aj7+QVj1h0PxgmCIXcYR5k+h/xFZZv3vKXYOFp2J4fw0/eDYAcs/dlDpANbhBjlCEJv6TiP2NGr uZbaRaCKkDdaiRWDlNS0eAafXkn3afVBLdg4OG5SB9h8DjEE9lvUODRe5xb43AI9LrrKR/+X8m16d tsKMNeaFRNM4zoajc10mmWZ5b/HQbUoipDlKXN+021zrXkuqmZqx/XWHROs3sub09KOM/EXF4HFQ9 IG1gwIr/ZBGRJPGiFf0A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qdok6-007tqL-2L; Wed, 06 Sep 2023 09:22:34 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qdok5-007tpi-2C; Wed, 06 Sep 2023 09:22:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=4lxgSeotXhtluM5Y7Gic0yIlmVnTTGRsI6a6z+f7glM=; b=TlKThJehuHSlsqG40bs4lNVUxo 50xVLae8rd7HpiSBYOls7+ARuFLsXGv9IZSkVM4U8dxXpAKAnLdYnCzXkVrKrfYVvqTDXao4shmNL w3SQkSgUq7xUjIX6Lw7RmWIVq9QHtAsXdVY+BWbqeH3WCn4wtniCTy7Z/yAdwBDrN+9gha/4cYpDL z2RETUCqaXN4mFRGtVBaK8quW2hqT5f+rbvaZYj86jrAMNWBuTgQGnje0pEs0tWbfpQ6DANlcP8vC +jNyjWt2RQVhy/7mQw64mRU74kxzdPjFGqTRF2Zkq3Mnii8J9Xqdz2TfcygtHDN20GYpybbzzI2I6 +DfYcvtQ==; Received: from mail-io1-xd44.google.com ([2607:f8b0:4864:20::d44]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qdok0-0010lh-0O; Wed, 06 Sep 2023 09:22:32 +0000 Received: by mail-io1-xd44.google.com with SMTP id ca18e2360f4ac-797ea09af91so4940239f.1; Wed, 06 Sep 2023 02:22:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693992147; x=1694596947; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4lxgSeotXhtluM5Y7Gic0yIlmVnTTGRsI6a6z+f7glM=; b=c/6CU5CkqGhGV/y7trn+/q1p0Zz4i+lVVT9Tuik0u3d7gIArp5TWh753Ae0V1KVium +vJpFLGcxV4sVFas+orsKjqcfHR1Z3jnUxxGx9JS0GNahIHA4wEE9KPJ9KC1IDhwpHPT /wn/L0MAh7sF+D9+9eZNMGyIQEvYNQ3mFLalFVX+M654fifW/eTs02h6XK8TU+TsCCtz sonr/wi9Dgs4OUMzei7yvAc04YQBAx8zVjPEsxlCCEWoTwprpRaKzwMoOa55K1wAfEgz TDYZ6T/B9yDaH/KN8dEarDLoAbMZTLb5oGq8IrNaWE4QurKTo0yU/naoH2iEcXm4Y/sO FMmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693992147; x=1694596947; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4lxgSeotXhtluM5Y7Gic0yIlmVnTTGRsI6a6z+f7glM=; b=CAb2yyQLJIN2o5BESUfdlwovG4PsVs+UA4JUaxbPNmO0vYk6yM2VOqjyYEMZNh5gnd pNLaBlYi20YhmcyZ66GtTAF0/nCEvsCvvCLteeOFTFRfMjgYVfVhxxI9C21fNcIaXBYg gKj1vHmj4ILyLFdVZ9W14eQsUlKQiiac+yMPAs7Hyl1KaT59KiwT3NP/d4qk5LYCMNo0 5JAhFOPQ4o4Gfdgqgfz2c0pYcO50p8u6CN9PTcRmGZQIsMzH5GaitQNv4JNxfgRP8hJ6 Sjijy62C4gDMR1Vbw382t3Ervxz39hvSAFdeQni8+QPS+HyGMRxCfeaCmtumjBN7CTGy X9vw== X-Gm-Message-State: AOJu0YznqsnJKIITl0ls1qjeXcRPVcQhaJf5FS+rnuFmVr9jVJt8dMJl +TIFOloyfubVB5qktvy1LT8= X-Google-Smtp-Source: AGHT+IHgtjBcMfcAVv0cvr5pcx0KRu57NHijg05g6vWK0eh4cHfhCe88XtFsAw8hxKpJW3dkgMFv5g== X-Received: by 2002:a05:6e02:216c:b0:34f:3b12:799e with SMTP id s12-20020a056e02216c00b0034f3b12799emr284714ilv.0.1693992147534; Wed, 06 Sep 2023 02:22:27 -0700 (PDT) Received: from hbh25y.mshome.net ([103.114.158.1]) by smtp.gmail.com with ESMTPSA id ft15-20020a17090b0f8f00b002684b837d88sm10679242pjb.14.2023.09.06.02.22.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 02:22:26 -0700 (PDT) From: Hangyu Hua To: justin.chen@broadcom.com, florian.fainelli@broadcom.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mw@semihalf.com, linux@armlinux.org.uk, nbd@nbd.name, john@phrozen.org, sean.wang@mediatek.com, Mark-MC.Lee@mediatek.com, lorenzo@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, maxime.chevallier@bootlin.com, nelson.chang@mediatek.com Cc: bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Hangyu Hua Subject: [PATCH 3/3] net: ethernet: mtk_eth_soc: fix possible NULL pointer dereference in mtk_hwlro_get_fdir_all() Date: Wed, 6 Sep 2023 17:21:07 +0800 Message-Id: <20230906092107.19063-4-hbh25y@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230906092107.19063-1-hbh25y@gmail.com> References: <20230906092107.19063-1-hbh25y@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230906_102229_927477_ACE592B0 X-CRM114-Status: GOOD ( 11.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org rule_locs is allocated in ethtool_get_rxnfc and the size is determined by rule_cnt from user space. So rule_cnt needs to be check before using rule_locs to avoid NULL pointer dereference. Fixes: 7aab747e5563 ("net: ethernet: mediatek: add ethtool functions to configure RX flows of HW LRO") Signed-off-by: Hangyu Hua --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 6ad42e3b488f..d91fc0483c50 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -2994,6 +2994,10 @@ static int mtk_hwlro_get_fdir_all(struct net_device *dev, int i; for (i = 0; i < MTK_MAX_LRO_IP_CNT; i++) { + if (cnt == cmd->rule_cnt) { + return -EMSGSIZE; + } + if (mac->hwlro_ip[i]) { rule_locs[cnt] = i; cnt++;