Skip to content

Commit d11a508

Browse files
edumazetgregkh
edumazet
authored and
gregkh
committed
tcp/dccp: fix ireq->opt races
[ Upstream commit c92e8c0 ] syzkaller found another bug in DCCP/TCP stacks [1] For the reasons explained in commit ce10500 ("tcp/dccp: fix ireq->pktopts race"), we need to make sure we do not access ireq->opt unless we own the request sock. Note the opt field is renamed to ireq_opt to ease grep games. [1] BUG: KASAN: use-after-free in ip_queue_xmit+0x1687/0x18e0 net/ipv4/ip_output.c:474 Read of size 1 at addr ffff8801c951039c by task syz-executor5/3295 CPU: 1 PID: 3295 Comm: syz-executor5 Not tainted 4.14.0-rc4+ #80 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:16 [inline] dump_stack+0x194/0x257 lib/dump_stack.c:52 print_address_description+0x73/0x250 mm/kasan/report.c:252 kasan_report_error mm/kasan/report.c:351 [inline] kasan_report+0x25b/0x340 mm/kasan/report.c:409 __asan_report_load1_noabort+0x14/0x20 mm/kasan/report.c:427 ip_queue_xmit+0x1687/0x18e0 net/ipv4/ip_output.c:474 tcp_transmit_skb+0x1ab7/0x3840 net/ipv4/tcp_output.c:1135 tcp_send_ack.part.37+0x3bb/0x650 net/ipv4/tcp_output.c:3587 tcp_send_ack+0x49/0x60 net/ipv4/tcp_output.c:3557 __tcp_ack_snd_check+0x2c6/0x4b0 net/ipv4/tcp_input.c:5072 tcp_ack_snd_check net/ipv4/tcp_input.c:5085 [inline] tcp_rcv_state_process+0x2eff/0x4850 net/ipv4/tcp_input.c:6071 tcp_child_process+0x342/0x990 net/ipv4/tcp_minisocks.c:816 tcp_v4_rcv+0x1827/0x2f80 net/ipv4/tcp_ipv4.c:1682 ip_local_deliver_finish+0x2e2/0xba0 net/ipv4/ip_input.c:216 NF_HOOK include/linux/netfilter.h:249 [inline] ip_local_deliver+0x1ce/0x6e0 net/ipv4/ip_input.c:257 dst_input include/net/dst.h:464 [inline] ip_rcv_finish+0x887/0x19a0 net/ipv4/ip_input.c:397 NF_HOOK include/linux/netfilter.h:249 [inline] ip_rcv+0xc3f/0x1820 net/ipv4/ip_input.c:493 __netif_receive_skb_core+0x1a3e/0x34b0 net/core/dev.c:4476 __netif_receive_skb+0x2c/0x1b0 net/core/dev.c:4514 netif_receive_skb_internal+0x10b/0x670 net/core/dev.c:4587 netif_receive_skb+0xae/0x390 net/core/dev.c:4611 tun_rx_batched.isra.50+0x5ed/0x860 drivers/net/tun.c:1372 tun_get_user+0x249c/0x36d0 drivers/net/tun.c:1766 tun_chr_write_iter+0xbf/0x160 drivers/net/tun.c:1792 call_write_iter include/linux/fs.h:1770 [inline] new_sync_write fs/read_write.c:468 [inline] __vfs_write+0x68a/0x970 fs/read_write.c:481 vfs_write+0x18f/0x510 fs/read_write.c:543 SYSC_write fs/read_write.c:588 [inline] SyS_write+0xef/0x220 fs/read_write.c:580 entry_SYSCALL_64_fastpath+0x1f/0xbe RIP: 0033:0x40c341 RSP: 002b:00007f469523ec10 EFLAGS: 00000293 ORIG_RAX: 0000000000000001 RAX: ffffffffffffffda RBX: 0000000000718000 RCX: 000000000040c341 RDX: 0000000000000037 RSI: 0000000020004000 RDI: 0000000000000015 RBP: 0000000000000086 R08: 0000000000000000 R09: 0000000000000000 R10: 00000000000f4240 R11: 0000000000000293 R12: 00000000004b7fd1 R13: 00000000ffffffff R14: 0000000020000000 R15: 0000000000025000 Allocated by task 3295: save_stack_trace+0x16/0x20 arch/x86/kernel/stacktrace.c:59 save_stack+0x43/0xd0 mm/kasan/kasan.c:447 set_track mm/kasan/kasan.c:459 [inline] kasan_kmalloc+0xad/0xe0 mm/kasan/kasan.c:551 __do_kmalloc mm/slab.c:3725 [inline] __kmalloc+0x162/0x760 mm/slab.c:3734 kmalloc include/linux/slab.h:498 [inline] tcp_v4_save_options include/net/tcp.h:1962 [inline] tcp_v4_init_req+0x2d3/0x3e0 net/ipv4/tcp_ipv4.c:1271 tcp_conn_request+0xf6d/0x3410 net/ipv4/tcp_input.c:6283 tcp_v4_conn_request+0x157/0x210 net/ipv4/tcp_ipv4.c:1313 tcp_rcv_state_process+0x8ea/0x4850 net/ipv4/tcp_input.c:5857 tcp_v4_do_rcv+0x55c/0x7d0 net/ipv4/tcp_ipv4.c:1482 tcp_v4_rcv+0x2d10/0x2f80 net/ipv4/tcp_ipv4.c:1711 ip_local_deliver_finish+0x2e2/0xba0 net/ipv4/ip_input.c:216 NF_HOOK include/linux/netfilter.h:249 [inline] ip_local_deliver+0x1ce/0x6e0 net/ipv4/ip_input.c:257 dst_input include/net/dst.h:464 [inline] ip_rcv_finish+0x887/0x19a0 net/ipv4/ip_input.c:397 NF_HOOK include/linux/netfilter.h:249 [inline] ip_rcv+0xc3f/0x1820 net/ipv4/ip_input.c:493 __netif_receive_skb_core+0x1a3e/0x34b0 net/core/dev.c:4476 __netif_receive_skb+0x2c/0x1b0 net/core/dev.c:4514 netif_receive_skb_internal+0x10b/0x670 net/core/dev.c:4587 netif_receive_skb+0xae/0x390 net/core/dev.c:4611 tun_rx_batched.isra.50+0x5ed/0x860 drivers/net/tun.c:1372 tun_get_user+0x249c/0x36d0 drivers/net/tun.c:1766 tun_chr_write_iter+0xbf/0x160 drivers/net/tun.c:1792 call_write_iter include/linux/fs.h:1770 [inline] new_sync_write fs/read_write.c:468 [inline] __vfs_write+0x68a/0x970 fs/read_write.c:481 vfs_write+0x18f/0x510 fs/read_write.c:543 SYSC_write fs/read_write.c:588 [inline] SyS_write+0xef/0x220 fs/read_write.c:580 entry_SYSCALL_64_fastpath+0x1f/0xbe Freed by task 3306: save_stack_trace+0x16/0x20 arch/x86/kernel/stacktrace.c:59 save_stack+0x43/0xd0 mm/kasan/kasan.c:447 set_track mm/kasan/kasan.c:459 [inline] kasan_slab_free+0x71/0xc0 mm/kasan/kasan.c:524 __cache_free mm/slab.c:3503 [inline] kfree+0xca/0x250 mm/slab.c:3820 inet_sock_destruct+0x59d/0x950 net/ipv4/af_inet.c:157 __sk_destruct+0xfd/0x910 net/core/sock.c:1560 sk_destruct+0x47/0x80 net/core/sock.c:1595 __sk_free+0x57/0x230 net/core/sock.c:1603 sk_free+0x2a/0x40 net/core/sock.c:1614 sock_put include/net/sock.h:1652 [inline] inet_csk_complete_hashdance+0xd5/0xf0 net/ipv4/inet_connection_sock.c:959 tcp_check_req+0xf4d/0x1620 net/ipv4/tcp_minisocks.c:765 tcp_v4_rcv+0x17f6/0x2f80 net/ipv4/tcp_ipv4.c:1675 ip_local_deliver_finish+0x2e2/0xba0 net/ipv4/ip_input.c:216 NF_HOOK include/linux/netfilter.h:249 [inline] ip_local_deliver+0x1ce/0x6e0 net/ipv4/ip_input.c:257 dst_input include/net/dst.h:464 [inline] ip_rcv_finish+0x887/0x19a0 net/ipv4/ip_input.c:397 NF_HOOK include/linux/netfilter.h:249 [inline] ip_rcv+0xc3f/0x1820 net/ipv4/ip_input.c:493 __netif_receive_skb_core+0x1a3e/0x34b0 net/core/dev.c:4476 __netif_receive_skb+0x2c/0x1b0 net/core/dev.c:4514 netif_receive_skb_internal+0x10b/0x670 net/core/dev.c:4587 netif_receive_skb+0xae/0x390 net/core/dev.c:4611 tun_rx_batched.isra.50+0x5ed/0x860 drivers/net/tun.c:1372 tun_get_user+0x249c/0x36d0 drivers/net/tun.c:1766 tun_chr_write_iter+0xbf/0x160 drivers/net/tun.c:1792 call_write_iter include/linux/fs.h:1770 [inline] new_sync_write fs/read_write.c:468 [inline] __vfs_write+0x68a/0x970 fs/read_write.c:481 vfs_write+0x18f/0x510 fs/read_write.c:543 SYSC_write fs/read_write.c:588 [inline] SyS_write+0xef/0x220 fs/read_write.c:580 entry_SYSCALL_64_fastpath+0x1f/0xbe Fixes: e994b2f ("tcp: do not lock listener to process SYN packets") Fixes: 079096f ("tcp/dccp: install syn_recv requests into ehash table") Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 4519a59 commit d11a508

File tree

7 files changed

+33
-39
lines changed

7 files changed

+33
-39
lines changed

‎include/net/inet_sock.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ struct inet_request_sock {
9696
kmemcheck_bitfield_end(flags);
9797
u32 ir_mark;
9898
union {
99-
struct ip_options_rcu *opt;
99+
struct ip_options_rcu __rcu *ireq_opt;
100100
#if IS_ENABLED(CONFIG_IPV6)
101101
struct {
102102
struct ipv6_txoptions *ipv6_opt;

‎net/dccp/ipv4.c‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,7 @@ struct sock *dccp_v4_request_recv_sock(const struct sock *sk,
414414
sk_daddr_set(newsk, ireq->ir_rmt_addr);
415415
sk_rcv_saddr_set(newsk, ireq->ir_loc_addr);
416416
newinet->inet_saddr = ireq->ir_loc_addr;
417-
newinet->inet_opt = ireq->opt;
418-
ireq->opt = NULL;
417+
RCU_INIT_POINTER(newinet->inet_opt, rcu_dereference(ireq->ireq_opt));
419418
newinet->mc_index = inet_iif(skb);
420419
newinet->mc_ttl = ip_hdr(skb)->ttl;
421420
newinet->inet_id = jiffies;
@@ -430,7 +429,10 @@ struct sock *dccp_v4_request_recv_sock(const struct sock *sk,
430429
if (__inet_inherit_port(sk, newsk) < 0)
431430
goto put_and_exit;
432431
*own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash));
433-
432+
if (*own_req)
433+
ireq->ireq_opt = NULL;
434+
else
435+
newinet->inet_opt = NULL;
434436
return newsk;
435437

436438
exit_overflow:
@@ -441,6 +443,7 @@ struct sock *dccp_v4_request_recv_sock(const struct sock *sk,
441443
__NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENDROPS);
442444
return NULL;
443445
put_and_exit:
446+
newinet->inet_opt = NULL;
444447
inet_csk_prepare_forced_close(newsk);
445448
dccp_done(newsk);
446449
goto exit;
@@ -492,7 +495,7 @@ static int dccp_v4_send_response(const struct sock *sk, struct request_sock *req
492495
ireq->ir_rmt_addr);
493496
err = ip_build_and_send_pkt(skb, sk, ireq->ir_loc_addr,
494497
ireq->ir_rmt_addr,
495-
ireq->opt);
498+
rcu_dereference(ireq->ireq_opt));
496499
err = net_xmit_eval(err);
497500
}
498501

@@ -548,7 +551,7 @@ static void dccp_v4_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb)
548551
static void dccp_v4_reqsk_destructor(struct request_sock *req)
549552
{
550553
dccp_feat_list_purge(&dccp_rsk(req)->dreq_featneg);
551-
kfree(inet_rsk(req)->opt);
554+
kfree(rcu_dereference_protected(inet_rsk(req)->ireq_opt, 1));
552555
}
553556

554557
void dccp_syn_ack_timeout(const struct request_sock *req)

‎net/ipv4/cipso_ipv4.c‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1951,7 +1951,7 @@ int cipso_v4_req_setattr(struct request_sock *req,
19511951
buf = NULL;
19521952

19531953
req_inet = inet_rsk(req);
1954-
opt = xchg(&req_inet->opt, opt);
1954+
opt = xchg((__force struct ip_options_rcu **)&req_inet->ireq_opt, opt);
19551955
if (opt)
19561956
kfree_rcu(opt, rcu);
19571957

@@ -1973,11 +1973,13 @@ int cipso_v4_req_setattr(struct request_sock *req,
19731973
* values on failure.
19741974
*
19751975
*/
1976-
static int cipso_v4_delopt(struct ip_options_rcu **opt_ptr)
1976+
static int cipso_v4_delopt(struct ip_options_rcu __rcu **opt_ptr)
19771977
{
1978+
struct ip_options_rcu *opt = rcu_dereference_protected(*opt_ptr, 1);
19781979
int hdr_delta = 0;
1979-
struct ip_options_rcu *opt = *opt_ptr;
19801980

1981+
if (!opt || opt->opt.cipso == 0)
1982+
return 0;
19811983
if (opt->opt.srr || opt->opt.rr || opt->opt.ts || opt->opt.router_alert) {
19821984
u8 cipso_len;
19831985
u8 cipso_off;
@@ -2039,14 +2041,10 @@ static int cipso_v4_delopt(struct ip_options_rcu **opt_ptr)
20392041
*/
20402042
void cipso_v4_sock_delattr(struct sock *sk)
20412043
{
2042-
int hdr_delta;
2043-
struct ip_options_rcu *opt;
20442044
struct inet_sock *sk_inet;
2045+
int hdr_delta;
20452046

20462047
sk_inet = inet_sk(sk);
2047-
opt = rcu_dereference_protected(sk_inet->inet_opt, 1);
2048-
if (!opt || opt->opt.cipso == 0)
2049-
return;
20502048

20512049
hdr_delta = cipso_v4_delopt(&sk_inet->inet_opt);
20522050
if (sk_inet->is_icsk && hdr_delta > 0) {
@@ -2066,15 +2064,7 @@ void cipso_v4_sock_delattr(struct sock *sk)
20662064
*/
20672065
void cipso_v4_req_delattr(struct request_sock *req)
20682066
{
2069-
struct ip_options_rcu *opt;
2070-
struct inet_request_sock *req_inet;
2071-
2072-
req_inet = inet_rsk(req);
2073-
opt = req_inet->opt;
2074-
if (!opt || opt->opt.cipso == 0)
2075-
return;
2076-
2077-
cipso_v4_delopt(&req_inet->opt);
2067+
cipso_v4_delopt(&inet_rsk(req)->ireq_opt);
20782068
}
20792069

20802070
/**

‎net/ipv4/inet_connection_sock.c‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -537,9 +537,10 @@ struct dst_entry *inet_csk_route_req(const struct sock *sk,
537537
{
538538
const struct inet_request_sock *ireq = inet_rsk(req);
539539
struct net *net = read_pnet(&ireq->ireq_net);
540-
struct ip_options_rcu *opt = ireq->opt;
540+
struct ip_options_rcu *opt;
541541
struct rtable *rt;
542542

543+
opt = rcu_dereference(ireq->ireq_opt);
543544
flowi4_init_output(fl4, ireq->ir_iif, ireq->ir_mark,
544545
RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
545546
sk->sk_protocol, inet_sk_flowi_flags(sk),
@@ -573,10 +574,9 @@ struct dst_entry *inet_csk_route_child_sock(const struct sock *sk,
573574
struct flowi4 *fl4;
574575
struct rtable *rt;
575576

577+
opt = rcu_dereference(ireq->ireq_opt);
576578
fl4 = &newinet->cork.fl.u.ip4;
577579

578-
rcu_read_lock();
579-
opt = rcu_dereference(newinet->inet_opt);
580580
flowi4_init_output(fl4, ireq->ir_iif, ireq->ir_mark,
581581
RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
582582
sk->sk_protocol, inet_sk_flowi_flags(sk),
@@ -589,13 +589,11 @@ struct dst_entry *inet_csk_route_child_sock(const struct sock *sk,
589589
goto no_route;
590590
if (opt && opt->opt.is_strictroute && rt->rt_uses_gateway)
591591
goto route_err;
592-
rcu_read_unlock();
593592
return &rt->dst;
594593

595594
route_err:
596595
ip_rt_put(rt);
597596
no_route:
598-
rcu_read_unlock();
599597
__IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);
600598
return NULL;
601599
}

‎net/ipv4/syncookies.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb)
355355
/* We throwed the options of the initial SYN away, so we hope
356356
* the ACK carries the same options again (see RFC1122 4.2.3.8)
357357
*/
358-
ireq->opt = tcp_v4_save_options(skb);
358+
RCU_INIT_POINTER(ireq->ireq_opt, tcp_v4_save_options(skb));
359359

360360
if (security_inet_conn_request(sk, skb, req)) {
361361
reqsk_free(req);

‎net/ipv4/tcp_input.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6235,7 +6235,7 @@ struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops,
62356235
struct inet_request_sock *ireq = inet_rsk(req);
62366236

62376237
kmemcheck_annotate_bitfield(ireq, flags);
6238-
ireq->opt = NULL;
6238+
ireq->ireq_opt = NULL;
62396239
#if IS_ENABLED(CONFIG_IPV6)
62406240
ireq->pktopts = NULL;
62416241
#endif

‎net/ipv4/tcp_ipv4.c‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -878,7 +878,7 @@ static int tcp_v4_send_synack(const struct sock *sk, struct dst_entry *dst,
878878

879879
err = ip_build_and_send_pkt(skb, sk, ireq->ir_loc_addr,
880880
ireq->ir_rmt_addr,
881-
ireq->opt);
881+
rcu_dereference(ireq->ireq_opt));
882882
err = net_xmit_eval(err);
883883
}
884884

@@ -890,7 +890,7 @@ static int tcp_v4_send_synack(const struct sock *sk, struct dst_entry *dst,
890890
*/
891891
static void tcp_v4_reqsk_destructor(struct request_sock *req)
892892
{
893-
kfree(inet_rsk(req)->opt);
893+
kfree(rcu_dereference_protected(inet_rsk(req)->ireq_opt, 1));
894894
}
895895

896896
#ifdef CONFIG_TCP_MD5SIG
@@ -1269,7 +1269,7 @@ static void tcp_v4_init_req(struct request_sock *req,
12691269

12701270
sk_rcv_saddr_set(req_to_sk(req), ip_hdr(skb)->daddr);
12711271
sk_daddr_set(req_to_sk(req), ip_hdr(skb)->saddr);
1272-
ireq->opt = tcp_v4_save_options(skb);
1272+
RCU_INIT_POINTER(ireq->ireq_opt, tcp_v4_save_options(skb));
12731273
}
12741274

12751275
static struct dst_entry *tcp_v4_route_req(const struct sock *sk,
@@ -1356,10 +1356,9 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,
13561356
sk_daddr_set(newsk, ireq->ir_rmt_addr);
13571357
sk_rcv_saddr_set(newsk, ireq->ir_loc_addr);
13581358
newsk->sk_bound_dev_if = ireq->ir_iif;
1359-
newinet->inet_saddr = ireq->ir_loc_addr;
1360-
inet_opt = ireq->opt;
1361-
rcu_assign_pointer(newinet->inet_opt, inet_opt);
1362-
ireq->opt = NULL;
1359+
newinet->inet_saddr = ireq->ir_loc_addr;
1360+
inet_opt = rcu_dereference(ireq->ireq_opt);
1361+
RCU_INIT_POINTER(newinet->inet_opt, inet_opt);
13631362
newinet->mc_index = inet_iif(skb);
13641363
newinet->mc_ttl = ip_hdr(skb)->ttl;
13651364
newinet->rcv_tos = ip_hdr(skb)->tos;
@@ -1404,9 +1403,12 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,
14041403
if (__inet_inherit_port(sk, newsk) < 0)
14051404
goto put_and_exit;
14061405
*own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash));
1407-
if (*own_req)
1406+
if (likely(*own_req)) {
14081407
tcp_move_syn(newtp, req);
1409-
1408+
ireq->ireq_opt = NULL;
1409+
} else {
1410+
newinet->inet_opt = NULL;
1411+
}
14101412
return newsk;
14111413

14121414
exit_overflow:
@@ -1417,6 +1419,7 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,
14171419
tcp_listendrop(sk);
14181420
return NULL;
14191421
put_and_exit:
1422+
newinet->inet_opt = NULL;
14201423
inet_csk_prepare_forced_close(newsk);
14211424
tcp_done(newsk);
14221425
goto exit;

0 commit comments

Comments
 (0)