[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20260211184848.731894-1-cnitlrt@gmail.com>
Date: Thu, 12 Feb 2026 02:48:48 +0800
From: Ruitong Liu <cnitlrt@...il.com>
To: netdev@...r.kernel.org
Cc: jhs@...atatu.com,
xiyou.wangcong@...il.com,
jiri@...nulli.us,
davem@...emloft.net,
edumazet@...gle.com,
kuba@...nel.org,
pabeni@...hat.com,
horms@...nel.org,
linux-kernel@...r.kernel.org,
Ruitong Liu <cnitlrt@...il.com>,
stable@...r.kernel.org,
Shuyuan Liu <L0x1c3r@...il.com>
Subject: [PATCH] net/sched: act_skbedit: fix divide-by-zero in tcf_skbedit_hash()
mapping_mod is computed as:
mapping_mod = queue_mapping_max - queue_mapping + 1;
mapping_mod is stored as u16, so the calculation can overflow when
queue_mapping=0 and queue_mapping_max=0xffff. In this case the value
wraps to 0, leading to a divide-by-zero in tcf_skbedit_hash():
queue_mapping += skb_get_hash(skb) % params->mapping_mod;
Fix it by using a wider type for mapping_mod and performing the
calculation in u32, preventing overflow to zero.
Fixes: 38a6f0865796 ("net: sched: support hash selecting tx queue")
Cc: stable@...r.kernel.org # 6.12+
Reported-by: Ruitong Liu <cnitlrt@...il.com>
Reported-by: Shuyuan Liu <L0x1c3r@...il.com>
Signed-off-by: Ruitong Liu <cnitlrt@...il.com>
---
include/net/tc_act/tc_skbedit.h | 2 +-
net/sched/act_skbedit.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/net/tc_act/tc_skbedit.h b/include/net/tc_act/tc_skbedit.h
index 31b2cd0bebb5..1353bcb15ac7 100644
--- a/include/net/tc_act/tc_skbedit.h
+++ b/include/net/tc_act/tc_skbedit.h
@@ -18,7 +18,7 @@ struct tcf_skbedit_params {
u32 mark;
u32 mask;
u16 queue_mapping;
- u16 mapping_mod;
+ u32 mapping_mod;
u16 ptype;
struct rcu_head rcu;
};
diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
index 8c1d1554f657..52f6ea6436b9 100644
--- a/net/sched/act_skbedit.c
+++ b/net/sched/act_skbedit.c
@@ -26,7 +26,7 @@ static struct tc_action_ops act_skbedit_ops;
static u16 tcf_skbedit_hash(struct tcf_skbedit_params *params,
struct sk_buff *skb)
{
- u16 queue_mapping = params->queue_mapping;
+ u32 queue_mapping = params->queue_mapping;
if (params->flags & SKBEDIT_F_TXQ_SKBHASH) {
u32 hash = skb_get_hash(skb);
@@ -34,7 +34,7 @@ static u16 tcf_skbedit_hash(struct tcf_skbedit_params *params,
queue_mapping += hash % params->mapping_mod;
}
- return netdev_cap_txqueue(skb->dev, queue_mapping);
+ return netdev_cap_txqueue(skb->dev, (u16)queue_mapping);
}
TC_INDIRECT_SCOPE int tcf_skbedit_act(struct sk_buff *skb,
@@ -126,7 +126,7 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
struct tcf_skbedit *d;
u32 flags = 0, *priority = NULL, *mark = NULL, *mask = NULL;
u16 *queue_mapping = NULL, *ptype = NULL;
- u16 mapping_mod = 1;
+ u32 mapping_mod = 1;
bool exists = false;
int ret = 0, err;
u32 index;
@@ -193,7 +193,7 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
return -EINVAL;
}
- mapping_mod = *queue_mapping_max - *queue_mapping + 1;
+ mapping_mod = (u32)(*queue_mapping_max) - (u32)(*queue_mapping) + 1;
flags |= SKBEDIT_F_TXQ_SKBHASH;
}
if (*pure_flags & SKBEDIT_F_INHERITDSFIELD)
@@ -319,7 +319,7 @@ static int tcf_skbedit_dump(struct sk_buff *skb, struct tc_action *a,
pure_flags |= SKBEDIT_F_INHERITDSFIELD;
if (params->flags & SKBEDIT_F_TXQ_SKBHASH) {
if (nla_put_u16(skb, TCA_SKBEDIT_QUEUE_MAPPING_MAX,
- params->queue_mapping + params->mapping_mod - 1))
+ (u16)(params->queue_mapping + params->mapping_mod - 1)))
goto nla_put_failure;
pure_flags |= SKBEDIT_F_TXQ_SKBHASH;
--
2.34.1
Powered by blists - more mailing lists