Skip to content

Commit 392053b

Browse files
edumazetgregkh
authored andcommitted
sch_cbq: validate TCA_CBQ_WRROPT to avoid crash
[ Upstream commit e9789c7 ] syzbot reported a crash in cbq_normalize_quanta() caused by an out of range cl->priority. iproute2 enforces this check, but malicious users do not. kasan: CONFIG_KASAN_INLINE enabled kasan: GPF could be caused by NULL-ptr deref or user memory access general protection fault: 0000 [#1] SMP KASAN PTI Modules linked in: CPU: 1 PID: 26447 Comm: syz-executor.1 Not tainted 5.3+ #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:cbq_normalize_quanta.part.0+0x1fd/0x430 net/sched/sch_cbq.c:902 RSP: 0018:ffff8801a5c333b0 EFLAGS: 00010206 RAX: 0000000020000003 RBX: 00000000fffffff8 RCX: ffffc9000712f000 RDX: 00000000000043bf RSI: ffffffff83be8962 RDI: 0000000100000018 RBP: ffff8801a5c33420 R08: 000000000000003a R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 00000000000002ef R13: ffff88018da95188 R14: dffffc0000000000 R15: 0000000000000015 FS: 00007f37d26b1700(0000) GS:ffff8801dad00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00000000004c7cec CR3: 00000001bcd0a006 CR4: 00000000001626f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: [<ffffffff83be9d57>] cbq_normalize_quanta include/net/pkt_sched.h:27 [inline] [<ffffffff83be9d57>] cbq_addprio net/sched/sch_cbq.c:1097 [inline] [<ffffffff83be9d57>] cbq_set_wrr+0x2d7/0x450 net/sched/sch_cbq.c:1115 [<ffffffff83bee8a7>] cbq_change_class+0x987/0x225b net/sched/sch_cbq.c:1537 [<ffffffff83b96985>] tc_ctl_tclass+0x555/0xcd0 net/sched/sch_api.c:2329 [<ffffffff83a84655>] rtnetlink_rcv_msg+0x485/0xc10 net/core/rtnetlink.c:5248 [<ffffffff83cadf0a>] netlink_rcv_skb+0x17a/0x460 net/netlink/af_netlink.c:2510 [<ffffffff83a7db6d>] rtnetlink_rcv+0x1d/0x30 net/core/rtnetlink.c:5266 [<ffffffff83cac2c6>] netlink_unicast_kernel net/netlink/af_netlink.c:1324 [inline] [<ffffffff83cac2c6>] netlink_unicast+0x536/0x720 net/netlink/af_netlink.c:1350 [<ffffffff83cacd4a>] netlink_sendmsg+0x89a/0xd50 net/netlink/af_netlink.c:1939 [<ffffffff8399d46e>] sock_sendmsg_nosec net/socket.c:673 [inline] [<ffffffff8399d46e>] sock_sendmsg+0x12e/0x170 net/socket.c:684 [<ffffffff8399f1fd>] ___sys_sendmsg+0x81d/0x960 net/socket.c:2359 [<ffffffff839a2d05>] __sys_sendmsg+0x105/0x1d0 net/socket.c:2397 [<ffffffff839a2df9>] SYSC_sendmsg net/socket.c:2406 [inline] [<ffffffff839a2df9>] SyS_sendmsg+0x29/0x30 net/socket.c:2404 [<ffffffff8101ccc8>] do_syscall_64+0x528/0x770 arch/x86/entry/common.c:305 [<ffffffff84400091>] entry_SYSCALL_64_after_hwframe+0x42/0xb7 Fixes: 1da177e ("Linux-2.6.12-rc2") Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: syzbot <syzkaller@googlegroups.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e752bb8 commit 392053b

File tree

1 file changed

+29
-14
lines changed

1 file changed

+29
-14
lines changed

net/sched/sch_cbq.c

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,6 +1127,33 @@ static const struct nla_policy cbq_policy[TCA_CBQ_MAX + 1] = {
11271127
[TCA_CBQ_POLICE] = { .len = sizeof(struct tc_cbq_police) },
11281128
};
11291129

1130+
static int cbq_opt_parse(struct nlattr *tb[TCA_CBQ_MAX + 1],
1131+
struct nlattr *opt,
1132+
struct netlink_ext_ack *extack)
1133+
{
1134+
int err;
1135+
1136+
if (!opt) {
1137+
NL_SET_ERR_MSG(extack, "CBQ options are required for this operation");
1138+
return -EINVAL;
1139+
}
1140+
1141+
err = nla_parse_nested_deprecated(tb, TCA_CBQ_MAX, opt,
1142+
cbq_policy, extack);
1143+
if (err < 0)
1144+
return err;
1145+
1146+
if (tb[TCA_CBQ_WRROPT]) {
1147+
const struct tc_cbq_wrropt *wrr = nla_data(tb[TCA_CBQ_WRROPT]);
1148+
1149+
if (wrr->priority > TC_CBQ_MAXPRIO) {
1150+
NL_SET_ERR_MSG(extack, "priority is bigger than TC_CBQ_MAXPRIO");
1151+
err = -EINVAL;
1152+
}
1153+
}
1154+
return err;
1155+
}
1156+
11301157
static int cbq_init(struct Qdisc *sch, struct nlattr *opt,
11311158
struct netlink_ext_ack *extack)
11321159
{
@@ -1139,13 +1166,7 @@ static int cbq_init(struct Qdisc *sch, struct nlattr *opt,
11391166
hrtimer_init(&q->delay_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED);
11401167
q->delay_timer.function = cbq_undelay;
11411168

1142-
if (!opt) {
1143-
NL_SET_ERR_MSG(extack, "CBQ options are required for this operation");
1144-
return -EINVAL;
1145-
}
1146-
1147-
err = nla_parse_nested_deprecated(tb, TCA_CBQ_MAX, opt, cbq_policy,
1148-
extack);
1169+
err = cbq_opt_parse(tb, opt, extack);
11491170
if (err < 0)
11501171
return err;
11511172

@@ -1464,13 +1485,7 @@ cbq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, struct nlattr **t
14641485
struct cbq_class *parent;
14651486
struct qdisc_rate_table *rtab = NULL;
14661487

1467-
if (!opt) {
1468-
NL_SET_ERR_MSG(extack, "Mandatory qdisc options missing");
1469-
return -EINVAL;
1470-
}
1471-
1472-
err = nla_parse_nested_deprecated(tb, TCA_CBQ_MAX, opt, cbq_policy,
1473-
extack);
1488+
err = cbq_opt_parse(tb, opt, extack);
14741489
if (err < 0)
14751490
return err;
14761491

0 commit comments

Comments
 (0)