Skip to content

Commit 4b7870c

Browse files
q2venintel-lab-lkp
authored andcommitted
ipv6: Restore fib6_config validation for SIOCADDRT.
syzkaller reported out-of-bounds read in ipv6_addr_prefix(), where the prefix length was over 128. The cited commit accidentally removed some fib6_config validation from the ioctl path. Let's restore the validation. [0]: BUG: KASAN: slab-out-of-bounds in ip6_route_info_create (./include/net/ipv6.h:616 net/ipv6/route.c:3814) Read of size 1 at addr ff11000138020ad4 by task repro/261 CPU: 3 UID: 0 PID: 261 Comm: repro Not tainted 6.15.0-rc3-00614-g0d15a26b247d torvalds#87 PREEMPT(voluntary) Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014 Call Trace: <TASK> dump_stack_lvl (lib/dump_stack.c:123) print_report (mm/kasan/report.c:409 mm/kasan/report.c:521) kasan_report (mm/kasan/report.c:636) ip6_route_info_create (./include/net/ipv6.h:616 net/ipv6/route.c:3814) ip6_route_add (net/ipv6/route.c:3902) ipv6_route_ioctl (net/ipv6/route.c:4523) inet6_ioctl (net/ipv6/af_inet6.c:577) sock_do_ioctl (net/socket.c:1190) sock_ioctl (net/socket.c:1314) __x64_sys_ioctl (fs/ioctl.c:51 fs/ioctl.c:906 fs/ioctl.c:892 fs/ioctl.c:892) do_syscall_64 (arch/x86/entry/syscall_64.c:63 arch/x86/entry/syscall_64.c:94) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130) RIP: 0033:0x7f518fb2de5d Code: ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 73 9f 1b 00 f7 d8 64 89 01 48 RSP: 002b:00007fff14f38d18 EFLAGS: 00000202 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f518fb2de5d RDX: 00000000200015c0 RSI: 000000000000890b RDI: 0000000000000003 RBP: 00007fff14f38d30 R08: 0000000000000800 R09: 0000000000000800 R10: 0000000000000000 R11: 0000000000000202 R12: 00007fff14f38e48 R13: 0000000000401136 R14: 0000000000403df0 R15: 00007f518fd3c000 </TASK> Fixes: fa76c16 ("ipv6: Move some validation from ip6_route_info_create() to rtm_to_fib6_config().") Reported-by: syzkaller <syzkaller@googlegroups.com> Reported-by: Yi Lai <yi1.lai@linux.intel.com> Closes: https://lore.kernel.org/netdev/aBAcKDEFoN%2FLntBF@ly-workstation/ Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
1 parent 0d15a26 commit 4b7870c

File tree

1 file changed

+55
-42
lines changed

1 file changed

+55
-42
lines changed

net/ipv6/route.c

Lines changed: 55 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4496,6 +4496,53 @@ void rt6_purge_dflt_routers(struct net *net)
44964496
rcu_read_unlock();
44974497
}
44984498

4499+
static int fib6_config_validate(struct fib6_config *cfg,
4500+
struct netlink_ext_ack *extack)
4501+
{
4502+
/* RTF_PCPU is an internal flag; can not be set by userspace */
4503+
if (cfg->fc_flags & RTF_PCPU) {
4504+
NL_SET_ERR_MSG(extack, "Userspace can not set RTF_PCPU");
4505+
goto errout;
4506+
}
4507+
4508+
/* RTF_CACHE is an internal flag; can not be set by userspace */
4509+
if (cfg->fc_flags & RTF_CACHE) {
4510+
NL_SET_ERR_MSG(extack, "Userspace can not set RTF_CACHE");
4511+
goto errout;
4512+
}
4513+
4514+
if (cfg->fc_type > RTN_MAX) {
4515+
NL_SET_ERR_MSG(extack, "Invalid route type");
4516+
goto errout;
4517+
}
4518+
4519+
if (cfg->fc_dst_len > 128) {
4520+
NL_SET_ERR_MSG(extack, "Invalid prefix length");
4521+
goto errout;
4522+
}
4523+
4524+
#ifdef CONFIG_IPV6_SUBTREES
4525+
if (cfg->fc_src_len > 128) {
4526+
NL_SET_ERR_MSG(extack, "Invalid source address length");
4527+
goto errout;
4528+
}
4529+
4530+
if (cfg->fc_nh_id && cfg->fc_src_len) {
4531+
NL_SET_ERR_MSG(extack, "Nexthops can not be used with source routing");
4532+
goto errout;
4533+
}
4534+
#else
4535+
if (cfg->fc_src_len) {
4536+
NL_SET_ERR_MSG(extack,
4537+
"Specifying source address requires IPV6_SUBTREES to be enabled");
4538+
goto errout;
4539+
}
4540+
#endif
4541+
return 0;
4542+
errout:
4543+
return -EINVAL;
4544+
}
4545+
44994546
static void rtmsg_to_fib6_config(struct net *net,
45004547
struct in6_rtmsg *rtmsg,
45014548
struct fib6_config *cfg)
@@ -4533,6 +4580,10 @@ int ipv6_route_ioctl(struct net *net, unsigned int cmd, struct in6_rtmsg *rtmsg)
45334580

45344581
switch (cmd) {
45354582
case SIOCADDRT:
4583+
err = fib6_config_validate(&cfg, NULL);
4584+
if (err)
4585+
break;
4586+
45364587
/* Only do the default setting of fc_metric in route adding */
45374588
if (cfg.fc_metric == 0)
45384589
cfg.fc_metric = IP6_RT_PRIO_USER;
@@ -5267,48 +5318,6 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,
52675318
}
52685319
}
52695320

5270-
if (newroute) {
5271-
/* RTF_PCPU is an internal flag; can not be set by userspace */
5272-
if (cfg->fc_flags & RTF_PCPU) {
5273-
NL_SET_ERR_MSG(extack, "Userspace can not set RTF_PCPU");
5274-
goto errout;
5275-
}
5276-
5277-
/* RTF_CACHE is an internal flag; can not be set by userspace */
5278-
if (cfg->fc_flags & RTF_CACHE) {
5279-
NL_SET_ERR_MSG(extack, "Userspace can not set RTF_CACHE");
5280-
goto errout;
5281-
}
5282-
5283-
if (cfg->fc_type > RTN_MAX) {
5284-
NL_SET_ERR_MSG(extack, "Invalid route type");
5285-
goto errout;
5286-
}
5287-
5288-
if (cfg->fc_dst_len > 128) {
5289-
NL_SET_ERR_MSG(extack, "Invalid prefix length");
5290-
goto errout;
5291-
}
5292-
5293-
#ifdef CONFIG_IPV6_SUBTREES
5294-
if (cfg->fc_src_len > 128) {
5295-
NL_SET_ERR_MSG(extack, "Invalid source address length");
5296-
goto errout;
5297-
}
5298-
5299-
if (cfg->fc_nh_id && cfg->fc_src_len) {
5300-
NL_SET_ERR_MSG(extack, "Nexthops can not be used with source routing");
5301-
goto errout;
5302-
}
5303-
#else
5304-
if (cfg->fc_src_len) {
5305-
NL_SET_ERR_MSG(extack,
5306-
"Specifying source address requires IPV6_SUBTREES to be enabled");
5307-
goto errout;
5308-
}
5309-
#endif
5310-
}
5311-
53125321
err = 0;
53135322
errout:
53145323
return err;
@@ -5703,6 +5712,10 @@ static int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh,
57035712
if (err < 0)
57045713
return err;
57055714

5715+
err = fib6_config_validate(cfg, extack);
5716+
if (err)
5717+
return err;
5718+
57065719
if (cfg.fc_metric == 0)
57075720
cfg.fc_metric = IP6_RT_PRIO_USER;
57085721

0 commit comments

Comments
 (0)