Skip to content

Commit bda06af

Browse files
wangyun2137gregkh
authored andcommitted
net: prevent user from passing illegal stab size
[ Upstream commit b193e15 ] We observed below report when playing with netlink sock: UBSAN: shift-out-of-bounds in net/sched/sch_api.c:580:10 shift exponent 249 is too large for 32-bit type CPU: 0 PID: 685 Comm: a.out Not tainted Call Trace: dump_stack_lvl+0x8d/0xcf ubsan_epilogue+0xa/0x4e __ubsan_handle_shift_out_of_bounds+0x161/0x182 __qdisc_calculate_pkt_len+0xf0/0x190 __dev_queue_xmit+0x2ed/0x15b0 it seems like kernel won't check the stab log value passing from user, and will use the insane value later to calculate pkt_len. This patch just add a check on the size/cell_log to avoid insane calculation. Reported-by: Abaci <abaci@linux.alibaba.com> Signed-off-by: Michael Wang <yun.wang@linux.alibaba.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 3d68c7b commit bda06af

2 files changed

Lines changed: 7 additions & 0 deletions

File tree

include/net/pkt_sched.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <uapi/linux/pkt_sched.h>
1212

1313
#define DEFAULT_TX_QUEUE_LEN 1000
14+
#define STAB_SIZE_LOG_MAX 30
1415

1516
struct qdisc_walker {
1617
int stop;

net/sched/sch_api.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,12 @@ static struct qdisc_size_table *qdisc_get_stab(struct nlattr *opt,
513513
return stab;
514514
}
515515

516+
if (s->size_log > STAB_SIZE_LOG_MAX ||
517+
s->cell_log > STAB_SIZE_LOG_MAX) {
518+
NL_SET_ERR_MSG(extack, "Invalid logarithmic size of size table");
519+
return ERR_PTR(-EINVAL);
520+
}
521+
516522
stab = kmalloc(sizeof(*stab) + tsize * sizeof(u16), GFP_KERNEL);
517523
if (!stab)
518524
return ERR_PTR(-ENOMEM);

0 commit comments

Comments
 (0)