From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 056BE50EC15; Wed, 30 Sep 2026 16:19:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790785159; cv=none; b=CzEu8oJc8D1GXX65DsRpvH4HBwnUgf1EYuJ9XPdnEsE51819bRB68S27glSh0jqItGkaShHGMZsgm+0IekTlCCVzyqM2JJXjKiepVylK+Ql7yVSUT8GcDXaG6mDi6Ub8LVJd/D6m9nv0j+WBhozCY8cgNvRMBXBMj0bcmjkmMmI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790785159; c=relaxed/simple; bh=+DqdGGaRTdSG9/w0Fk8sruKfUQd3S+4KfUo6MS3vw4Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mrs+nDeQcLx6h0RBZTYLDZjDkQwJoHCnuqvI/blvbcLfBxKDliEa+yDOCMROtZXUe7V1Ttkkx9f2BKwePnXviTVxA23nzSwPsWs9irle0c43qpU/YOe1/DY2+xS1zyemusNJz5/xfu2GO44b2FqG9l+rylF5HIuzRvKzIQLKlTs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Y1VIkROo; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Y1VIkROo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E656A1F0089B; Wed, 30 Sep 2026 16:19:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790785155; bh=2rZEA/j92GlvqlGS/xjkcZ84/kDB2tm09qbwKhQZYZE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Y1VIkROopkx9y7eSDRdtiXmcIlaYAYfTRm0mmwI7oFkM1YYfHP7FFL9aBFRfrFCfb KBas9nzU+3Fa83Ccafksp6qjDbGDBUgHCLtvPgdn59KDG1pKXsylcWH9c8zVIXfOzw rTbAFwoytfjzC2nC5WNbl+bm2w3ikgiQ7uPkjbGY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jonas Gorski , Florian Fainelli , Joe Damato , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 410/982] net: dsa: bcm_sf2: bound the CFP rule dump by the callers buffer size Date: Wed, 30 Sep 2026 17:19:06 +0200 Message-ID: <20260930152425.613647299@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152416.775402466@linuxfoundation.org> References: <20260930152416.775402466@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jakub Kicinski [ Upstream commit cdb719f4b8596d9ccee2d56d204c2c4dce982f46 ] bcm_sf2_cfp_rule_get_all() walks the whole cfp.unique bitmap into rule_locs[] without consulting nfc->rule_cnt, which is how many entries the caller had room for. ETHTOOL_GRXCLSRLALL requires no CAP_NET_ADMIN and the ioctl sizes the buffer from the rule_cnt userspace passes in, so once an admin has installed CFP rules any user can ask for fewer slots than there are rules and run off the end of the allocation. A rule_cnt of 0 leaves the buffer pointer NULL and the walk dereferences it. Fixes: 7318166cacad ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc") Reviewed-by: Jonas Gorski Reviewed-by: Florian Fainelli Reviewed-by: Joe Damato Link: https://patch.msgid.link/20260903032611.3000029-2-kuba@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/dsa/bcm_sf2_cfp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/dsa/bcm_sf2_cfp.c b/drivers/net/dsa/bcm_sf2_cfp.c index c4010b7bf0899..f48ac7b021f37 100644 --- a/drivers/net/dsa/bcm_sf2_cfp.c +++ b/drivers/net/dsa/bcm_sf2_cfp.c @@ -1088,6 +1088,8 @@ static int bcm_sf2_cfp_rule_get_all(struct bcm_sf2_priv *priv, unsigned int index = 1, rules_cnt = 0; for_each_set_bit_from(index, priv->cfp.unique, priv->num_cfp_rules) { + if (rules_cnt == nfc->rule_cnt) + return -EMSGSIZE; rule_locs[rules_cnt] = index; rules_cnt++; } -- 2.53.0