Skip to content

Commit 3c2b95b

Browse files
cnitlrtSasha Levin
authored andcommitted
net/sched: act_skbedit: fix divide-by-zero in tcf_skbedit_hash()
[ Upstream commit be054cc ] Commit 38a6f08 ("net: sched: support hash selecting tx queue") added SKBEDIT_F_TXQ_SKBHASH support. The inclusive range size is computed as: mapping_mod = queue_mapping_max - queue_mapping + 1; The range size can be 65536 when the requested range covers all possible u16 queue IDs (e.g. queue_mapping=0 and queue_mapping_max=U16_MAX). That value cannot be represented in a u16 and previously wrapped to 0, so tcf_skbedit_hash() could trigger a divide-by-zero: queue_mapping += skb_get_hash(skb) % params->mapping_mod; Compute mapping_mod in a wider type and reject ranges larger than U16_MAX to prevent params->mapping_mod from becoming 0 and avoid the crash. Fixes: 38a6f08 ("net: sched: support hash selecting tx queue") Cc: stable@vger.kernel.org # 6.12+ Signed-off-by: Ruitong Liu <cnitlrt@gmail.com> Link: https://patch.msgid.link/20260213175948.1505257-1-cnitlrt@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 7e54ff9 commit 3c2b95b

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

net/sched/act_skbedit.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
126126
struct tcf_skbedit *d;
127127
u32 flags = 0, *priority = NULL, *mark = NULL, *mask = NULL;
128128
u16 *queue_mapping = NULL, *ptype = NULL;
129-
u16 mapping_mod = 1;
129+
u32 mapping_mod = 1;
130130
bool exists = false;
131131
int ret = 0, err;
132132
u32 index;
@@ -194,6 +194,10 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
194194
}
195195

196196
mapping_mod = *queue_mapping_max - *queue_mapping + 1;
197+
if (mapping_mod > U16_MAX) {
198+
NL_SET_ERR_MSG_MOD(extack, "The range of queue_mapping is invalid.");
199+
return -EINVAL;
200+
}
197201
flags |= SKBEDIT_F_TXQ_SKBHASH;
198202
}
199203
if (*pure_flags & SKBEDIT_F_INHERITDSFIELD)

0 commit comments

Comments
 (0)