| From b0a0c1fd4d2e6094fab8ac957666f92ab94a7db4 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 9 Dec 2021 10:50:58 -0800 |
| Subject: inet_diag: fix kernel-infoleak for UDP sockets |
| |
| From: Eric Dumazet <edumazet@google.com> |
| |
| [ Upstream commit 71ddeac8cd1d217744a0e060ff520e147c9328d1 ] |
| |
| KMSAN reported a kernel-infoleak [1], that can exploited |
| by unpriv users. |
| |
| After analysis it turned out UDP was not initializing |
| r->idiag_expires. Other users of inet_sk_diag_fill() |
| might make the same mistake in the future, so fix this |
| in inet_sk_diag_fill(). |
| |
| [1] |
| BUG: KMSAN: kernel-infoleak in instrument_copy_to_user include/linux/instrumented.h:121 [inline] |
| BUG: KMSAN: kernel-infoleak in copyout lib/iov_iter.c:156 [inline] |
| BUG: KMSAN: kernel-infoleak in _copy_to_iter+0x69d/0x25c0 lib/iov_iter.c:670 |
| instrument_copy_to_user include/linux/instrumented.h:121 [inline] |
| copyout lib/iov_iter.c:156 [inline] |
| _copy_to_iter+0x69d/0x25c0 lib/iov_iter.c:670 |
| copy_to_iter include/linux/uio.h:155 [inline] |
| simple_copy_to_iter+0xf3/0x140 net/core/datagram.c:519 |
| __skb_datagram_iter+0x2cb/0x1280 net/core/datagram.c:425 |
| skb_copy_datagram_iter+0xdc/0x270 net/core/datagram.c:533 |
| skb_copy_datagram_msg include/linux/skbuff.h:3657 [inline] |
| netlink_recvmsg+0x660/0x1c60 net/netlink/af_netlink.c:1974 |
| sock_recvmsg_nosec net/socket.c:944 [inline] |
| sock_recvmsg net/socket.c:962 [inline] |
| sock_read_iter+0x5a9/0x630 net/socket.c:1035 |
| call_read_iter include/linux/fs.h:2156 [inline] |
| new_sync_read fs/read_write.c:400 [inline] |
| vfs_read+0x1631/0x1980 fs/read_write.c:481 |
| ksys_read+0x28c/0x520 fs/read_write.c:619 |
| __do_sys_read fs/read_write.c:629 [inline] |
| __se_sys_read fs/read_write.c:627 [inline] |
| __x64_sys_read+0xdb/0x120 fs/read_write.c:627 |
| do_syscall_x64 arch/x86/entry/common.c:51 [inline] |
| do_syscall_64+0x54/0xd0 arch/x86/entry/common.c:82 |
| entry_SYSCALL_64_after_hwframe+0x44/0xae |
| |
| Uninit was created at: |
| slab_post_alloc_hook mm/slab.h:524 [inline] |
| slab_alloc_node mm/slub.c:3251 [inline] |
| __kmalloc_node_track_caller+0xe0c/0x1510 mm/slub.c:4974 |
| kmalloc_reserve net/core/skbuff.c:354 [inline] |
| __alloc_skb+0x545/0xf90 net/core/skbuff.c:426 |
| alloc_skb include/linux/skbuff.h:1126 [inline] |
| netlink_dump+0x3d5/0x16a0 net/netlink/af_netlink.c:2245 |
| __netlink_dump_start+0xd1c/0xee0 net/netlink/af_netlink.c:2370 |
| netlink_dump_start include/linux/netlink.h:254 [inline] |
| inet_diag_handler_cmd+0x2e7/0x400 net/ipv4/inet_diag.c:1343 |
| sock_diag_rcv_msg+0x24a/0x620 |
| netlink_rcv_skb+0x447/0x800 net/netlink/af_netlink.c:2491 |
| sock_diag_rcv+0x63/0x80 net/core/sock_diag.c:276 |
| netlink_unicast_kernel net/netlink/af_netlink.c:1319 [inline] |
| netlink_unicast+0x1095/0x1360 net/netlink/af_netlink.c:1345 |
| netlink_sendmsg+0x16f3/0x1870 net/netlink/af_netlink.c:1916 |
| sock_sendmsg_nosec net/socket.c:704 [inline] |
| sock_sendmsg net/socket.c:724 [inline] |
| sock_write_iter+0x594/0x690 net/socket.c:1057 |
| do_iter_readv_writev+0xa7f/0xc70 |
| do_iter_write+0x52c/0x1500 fs/read_write.c:851 |
| vfs_writev fs/read_write.c:924 [inline] |
| do_writev+0x63f/0xe30 fs/read_write.c:967 |
| __do_sys_writev fs/read_write.c:1040 [inline] |
| __se_sys_writev fs/read_write.c:1037 [inline] |
| __x64_sys_writev+0xe5/0x120 fs/read_write.c:1037 |
| do_syscall_x64 arch/x86/entry/common.c:51 [inline] |
| do_syscall_64+0x54/0xd0 arch/x86/entry/common.c:82 |
| entry_SYSCALL_64_after_hwframe+0x44/0xae |
| |
| Bytes 68-71 of 312 are uninitialized |
| Memory access of size 312 starts at ffff88812ab54000 |
| Data copied to user address 0000000020001440 |
| |
| CPU: 1 PID: 6365 Comm: syz-executor801 Not tainted 5.16.0-rc3-syzkaller #0 |
| Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 |
| |
| Fixes: 3c4d05c80567 ("inet_diag: Introduce the inet socket dumping routine") |
| Signed-off-by: Eric Dumazet <edumazet@google.com> |
| Reported-by: syzbot <syzkaller@googlegroups.com> |
| Link: https://lore.kernel.org/r/20211209185058.53917-1-eric.dumazet@gmail.com |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| net/ipv4/inet_diag.c | 4 +--- |
| 1 file changed, 1 insertion(+), 3 deletions(-) |
| |
| diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c |
| index ef7897226f08e..ae70e07c52445 100644 |
| --- a/net/ipv4/inet_diag.c |
| +++ b/net/ipv4/inet_diag.c |
| @@ -261,6 +261,7 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, |
| r->idiag_state = sk->sk_state; |
| r->idiag_timer = 0; |
| r->idiag_retrans = 0; |
| + r->idiag_expires = 0; |
| |
| if (inet_diag_msg_attrs_fill(sk, skb, r, ext, |
| sk_user_ns(NETLINK_CB(cb->skb).sk), |
| @@ -314,9 +315,6 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, |
| r->idiag_retrans = icsk->icsk_probes_out; |
| r->idiag_expires = |
| jiffies_delta_to_msecs(sk->sk_timer.expires - jiffies); |
| - } else { |
| - r->idiag_timer = 0; |
| - r->idiag_expires = 0; |
| } |
| |
| if ((ext & (1 << (INET_DIAG_INFO - 1))) && handler->idiag_info_size) { |
| -- |
| 2.33.0 |
| |