Skip to content

Commit 57b3fe0

Browse files
q2vengregkh
authored andcommitted
net/sched: taprio: Limit TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME to INT_MAX.
[ Upstream commit e739718 ] syzkaller found zero division error [0] in div_s64_rem() called from get_cycle_time_elapsed(), where sched->cycle_time is the divisor. We have tests in parse_taprio_schedule() so that cycle_time will never be 0, and actually cycle_time is not 0 in get_cycle_time_elapsed(). The problem is that the types of divisor are different; cycle_time is s64, but the argument of div_s64_rem() is s32. syzkaller fed this input and 0x100000000 is cast to s32 to be 0. @TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME={0xc, 0x8, 0x100000000} We use s64 for cycle_time to cast it to ktime_t, so let's keep it and set max for cycle_time. While at it, we prevent overflow in setup_txtime() and add another test in parse_taprio_schedule() to check if cycle_time overflows. Also, we add a new tdc test case for this issue. [0]: divide error: 0000 [#1] PREEMPT SMP KASAN NOPTI CPU: 1 PID: 103 Comm: kworker/1:3 Not tainted 6.5.0-rc1-00330-g60cc1f7d0605 #3 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014 Workqueue: ipv6_addrconf addrconf_dad_work RIP: 0010:div_s64_rem include/linux/math64.h:42 [inline] RIP: 0010:get_cycle_time_elapsed net/sched/sch_taprio.c:223 [inline] RIP: 0010:find_entry_to_transmit+0x252/0x7e0 net/sched/sch_taprio.c:344 Code: 3c 02 00 0f 85 5e 05 00 00 48 8b 4c 24 08 4d 8b bd 40 01 00 00 48 8b 7c 24 48 48 89 c8 4c 29 f8 48 63 f7 48 99 48 89 74 24 70 <48> f7 fe 48 29 d1 48 8d 04 0f 49 89 cc 48 89 44 24 20 49 8d 85 10 RSP: 0018:ffffc90000acf260 EFLAGS: 00010206 RAX: 177450e0347560cf RBX: 0000000000000000 RCX: 177450e0347560cf RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000100000000 RBP: 0000000000000056 R08: 0000000000000000 R09: ffffed10020a0934 R10: ffff8880105049a7 R11: ffff88806cf3a520 R12: ffff888010504800 R13: ffff88800c00d800 R14: ffff8880105049a0 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff88806cf00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f0edf84f0e8 CR3: 000000000d73c002 CR4: 0000000000770ee0 PKRU: 55555554 Call Trace: <TASK> get_packet_txtime net/sched/sch_taprio.c:508 [inline] taprio_enqueue_one+0x900/0xff0 net/sched/sch_taprio.c:577 taprio_enqueue+0x378/0xae0 net/sched/sch_taprio.c:658 dev_qdisc_enqueue+0x46/0x170 net/core/dev.c:3732 __dev_xmit_skb net/core/dev.c:3821 [inline] __dev_queue_xmit+0x1b2f/0x3000 net/core/dev.c:4169 dev_queue_xmit include/linux/netdevice.h:3088 [inline] neigh_resolve_output net/core/neighbour.c:1552 [inline] neigh_resolve_output+0x4a7/0x780 net/core/neighbour.c:1532 neigh_output include/net/neighbour.h:544 [inline] ip6_finish_output2+0x924/0x17d0 net/ipv6/ip6_output.c:135 __ip6_finish_output+0x620/0xaa0 net/ipv6/ip6_output.c:196 ip6_finish_output net/ipv6/ip6_output.c:207 [inline] NF_HOOK_COND include/linux/netfilter.h:292 [inline] ip6_output+0x206/0x410 net/ipv6/ip6_output.c:228 dst_output include/net/dst.h:458 [inline] NF_HOOK.constprop.0+0xea/0x260 include/linux/netfilter.h:303 ndisc_send_skb+0x872/0xe80 net/ipv6/ndisc.c:508 ndisc_send_ns+0xb5/0x130 net/ipv6/ndisc.c:666 addrconf_dad_work+0xc14/0x13f0 net/ipv6/addrconf.c:4175 process_one_work+0x92c/0x13a0 kernel/workqueue.c:2597 worker_thread+0x60f/0x1240 kernel/workqueue.c:2748 kthread+0x2fe/0x3f0 kernel/kthread.c:389 ret_from_fork+0x2c/0x50 arch/x86/entry/entry_64.S:308 </TASK> Modules linked in: Fixes: 4cfd577 ("taprio: Add support for txtime-assist mode") Reported-by: syzkaller <[email protected]> Signed-off-by: Kuniyuki Iwashima <[email protected]> Co-developed-by: Eric Dumazet <[email protected]> Co-developed-by: Pedro Tammela <[email protected]> Acked-by: Vinicius Costa Gomes <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 7e7c4fd commit 57b3fe0

File tree

2 files changed

+38
-2
lines changed

2 files changed

+38
-2
lines changed

net/sched/sch_taprio.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,6 +1013,11 @@ static const struct nla_policy taprio_tc_policy[TCA_TAPRIO_TC_ENTRY_MAX + 1] = {
10131013
TC_FP_PREEMPTIBLE),
10141014
};
10151015

1016+
static struct netlink_range_validation_signed taprio_cycle_time_range = {
1017+
.min = 0,
1018+
.max = INT_MAX,
1019+
};
1020+
10161021
static const struct nla_policy taprio_policy[TCA_TAPRIO_ATTR_MAX + 1] = {
10171022
[TCA_TAPRIO_ATTR_PRIOMAP] = {
10181023
.len = sizeof(struct tc_mqprio_qopt)
@@ -1021,7 +1026,8 @@ static const struct nla_policy taprio_policy[TCA_TAPRIO_ATTR_MAX + 1] = {
10211026
[TCA_TAPRIO_ATTR_SCHED_BASE_TIME] = { .type = NLA_S64 },
10221027
[TCA_TAPRIO_ATTR_SCHED_SINGLE_ENTRY] = { .type = NLA_NESTED },
10231028
[TCA_TAPRIO_ATTR_SCHED_CLOCKID] = { .type = NLA_S32 },
1024-
[TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME] = { .type = NLA_S64 },
1029+
[TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME] =
1030+
NLA_POLICY_FULL_RANGE_SIGNED(NLA_S64, &taprio_cycle_time_range),
10251031
[TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME_EXTENSION] = { .type = NLA_S64 },
10261032
[TCA_TAPRIO_ATTR_FLAGS] = { .type = NLA_U32 },
10271033
[TCA_TAPRIO_ATTR_TXTIME_DELAY] = { .type = NLA_U32 },
@@ -1157,6 +1163,11 @@ static int parse_taprio_schedule(struct taprio_sched *q, struct nlattr **tb,
11571163
return -EINVAL;
11581164
}
11591165

1166+
if (cycle < 0 || cycle > INT_MAX) {
1167+
NL_SET_ERR_MSG(extack, "'cycle_time' is too big");
1168+
return -EINVAL;
1169+
}
1170+
11601171
new->cycle_time = cycle;
11611172
}
11621173

@@ -1345,7 +1356,7 @@ static void setup_txtime(struct taprio_sched *q,
13451356
struct sched_gate_list *sched, ktime_t base)
13461357
{
13471358
struct sched_entry *entry;
1348-
u32 interval = 0;
1359+
u64 interval = 0;
13491360

13501361
list_for_each_entry(entry, &sched->entries, list) {
13511362
entry->next_txtime = ktime_add_ns(base, interval);

tools/testing/selftests/tc-testing/tc-tests/qdiscs/taprio.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,5 +131,30 @@
131131
"teardown": [
132132
"echo \"1\" > /sys/bus/netdevsim/del_device"
133133
]
134+
},
135+
{
136+
"id": "3e1e",
137+
"name": "Add taprio Qdisc with an invalid cycle-time",
138+
"category": [
139+
"qdisc",
140+
"taprio"
141+
],
142+
"plugins": {
143+
"requires": "nsPlugin"
144+
},
145+
"setup": [
146+
"echo \"1 1 8\" > /sys/bus/netdevsim/new_device",
147+
"$TC qdisc add dev $ETH root handle 1: taprio num_tc 3 map 2 2 1 0 2 2 2 2 2 2 2 2 2 2 2 2 queues 1@0 1@0 1@0 base-time 1000000000 sched-entry S 01 300000 flags 0x1 clockid CLOCK_TAI cycle-time 4294967296 || /bin/true",
148+
"$IP link set dev $ETH up",
149+
"$IP addr add 10.10.10.10/24 dev $ETH"
150+
],
151+
"cmdUnderTest": "/bin/true",
152+
"expExitCode": "0",
153+
"verifyCmd": "$TC qdisc show dev $ETH",
154+
"matchPattern": "qdisc taprio 1: root refcnt",
155+
"matchCount": "0",
156+
"teardown": [
157+
"echo \"1\" > /sys/bus/netdevsim/del_device"
158+
]
134159
}
135160
]

0 commit comments

Comments
 (0)