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 0A6A3384CD5; Thu, 17 Sep 2026 18:40:43 +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=1789670445; cv=none; b=RvHnf926Adzd6s3I6dFDh8b1K86u1tgIyGP42caftCgXXNa4lfGWL5oHfjfXAGTVv6yQoQeTRPEFObWlDFV5duZUTbqvlhfgDo8P9GRBCgbkMEu9+Q2ww0HuOLYiU5QgrqfjTL+l5NzNezupD2LqOJILewZKgmrVfQ4py8rtQtE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789670445; c=relaxed/simple; bh=9kBD6eNpAWlWMOMfdOFPI1dLdlhToRHNzr5sJ5lmOec=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BqW6fM781bM9LZc4rOs+TSRD7INGOxlW8RG52BgQ8vprmo7oZNvxJmHI0FfzSR7ihJUZkDV182z/v/t+W0G/Qaig7W617l7A/XK9bien+TL5UKtT+IPd/oIP0un6QneYqaSbQAqcGoGdSg3HBqYnjUWDOqRWzZtDrunTOW2QdO4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OhflN8FO; 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="OhflN8FO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D4901F000FF; Thu, 17 Sep 2026 18:40:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789670443; bh=RgcxE65WwDKszCaXa/SXitqpzfwmSzoFZcDd/wBPavw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OhflN8FO8mHzSccWrOELuhKywOJ6QOBYYRJ+UPcvQX07VJYHjElczCVEZVpHjON7m UHGohT2BRJsQC2gL0zPOlsx4gk3VcK5r8+LFSbj5cDBkcPgjWKYwb8WhoJnAKFse6z iRMR9KWUVb5Hc1Bum9tPOwBVp3XwLrZ9p9fH4TH0= 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.12 0663/1102] net: dsa: bcm_sf2: bound the CFP rule dump by the callers buffer size Date: Thu, 17 Sep 2026 16:10:06 +0100 Message-ID: <20260917151556.843793509@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260917151539.408551884@linuxfoundation.org> References: <20260917151539.408551884@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.12-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 c88ee3dd42997..4829065b4d5d0 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