Eric Dumazet 1502f15b9f sctp: fix kernel-infoleak for SCTP sockets ... [ Upstream commit 633593a808 ] syzbot reported a kernel infoleak [1] of 4 bytes. After analysis, it turned out r->idiag_expires is not initialized if inet_sctp_diag_fill() calls inet_diag_msg_common_fill() Make sure to clear idiag_timer/idiag_retrans/idiag_expires and let inet_diag_msg_sctpasoc_fill() fill them again if needed. [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:154 [inline] BUG: KMSAN: kernel-infoleak in _copy_to_iter+0x6ef/0x25a0 lib/iov_iter.c:668 instrument_copy_to_user include/linux/instrumented.h:121 [inline] copyout lib/iov_iter.c:154 [inline] _copy_to_iter+0x6ef/0x25a0 lib/iov_iter.c:668 copy_to_iter include/linux/uio.h:162 [inline] simple_copy_to_iter+0xf3/0x140 net/core/datagram.c:519 __skb_datagram_iter+0x2d5/0x11b0 net/core/datagram.c:425 skb_copy_datagram_iter+0xdc/0x270 net/core/datagram.c:533 skb_copy_datagram_msg include/linux/skbuff.h:3696 [inline] netlink_recvmsg+0x669/0x1c80 net/netlink/af_netlink.c:1977 sock_recvmsg_nosec net/socket.c:948 [inline] sock_recvmsg net/socket.c:966 [inline] __sys_recvfrom+0x795/0xa10 net/socket.c:2097 __do_sys_recvfrom net/socket.c:2115 [inline] __se_sys_recvfrom net/socket.c:2111 [inline] __x64_sys_recvfrom+0x19d/0x210 net/socket.c:2111 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:737 [inline] slab_alloc_node mm/slub.c:3247 [inline] __kmalloc_node_track_caller+0xe0c/0x1510 mm/slub.c:4975 kmalloc_reserve net/core/skbuff.c:354 [inline] __alloc_skb+0x545/0xf90 net/core/skbuff.c:426 alloc_skb include/linux/skbuff.h:1158 [inline] netlink_dump+0x3e5/0x16c0 net/netlink/af_netlink.c:2248 __netlink_dump_start+0xcf8/0xe90 net/netlink/af_netlink.c:2373 netlink_dump_start include/linux/netlink.h:254 [inline] inet_diag_handler_cmd+0x2e7/0x400 net/ipv4/inet_diag.c:1341 sock_diag_rcv_msg+0x24a/0x620 netlink_rcv_skb+0x40c/0x7e0 net/netlink/af_netlink.c:2494 sock_diag_rcv+0x63/0x80 net/core/sock_diag.c:277 netlink_unicast_kernel net/netlink/af_netlink.c:1317 [inline] netlink_unicast+0x1093/0x1360 net/netlink/af_netlink.c:1343 netlink_sendmsg+0x14d9/0x1720 net/netlink/af_netlink.c:1919 sock_sendmsg_nosec net/socket.c:705 [inline] sock_sendmsg net/socket.c:725 [inline] sock_write_iter+0x594/0x690 net/socket.c:1061 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+0x645/0xe00 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 2508 are uninitialized Memory access of size 2508 starts at ffff888114f9b000 Data copied to user address 00007f7fe09ff2e0 CPU: 1 PID: 3478 Comm: syz-executor306 Not tainted 5.17.0-rc4-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Fixes: 8f840e47f1 ("sctp: add the sctp_diag.c file") Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: syzbot <syzkaller@googlegroups.com> Cc: Vlad Yasevich <vyasevich@gmail.com> Cc: Neil Horman <nhorman@tuxdriver.com> Cc: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Reviewed-by: Xin Long <lucien.xin@gmail.com> Link: https://lore.kernel.org/r/20220310001145.297371-1-eric.dumazet@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>		2022-03-16 14:23:39 +01:00
..
associola.c	sctp: enable PLPMTUD when the transport is ready	2021-06-22 11:28:52 -07:00
auth.c	sctp: move the active_key update after sh_keys is added	2021-08-03 11:43:43 +01:00
bind_addr.c	sctp: validate from_addr_param return	2021-06-28 15:34:50 -07:00
chunk.c	net: sctp: chunk.c: delete duplicated word	2020-08-24 16:21:43 -07:00
debug.c	sctp: add the probe timer in transport for PLPMTUD	2021-06-22 11:28:52 -07:00
diag.c	sctp: fix kernel-infoleak for SCTP sockets	2022-03-16 14:23:39 +01:00
endpointola.c	sctp: use call_rcu to free endpoint	2022-01-05 12:42:35 +01:00
input.c	sctp: break out if skb_header_pointer returns NULL in sctp_rcv_ootb	2021-09-24 10:36:19 +01:00
inqueue.c
ipv6.c	sctp: delete addr based on sin6_scope_id	2021-07-26 12:34:03 +01:00
Kconfig	sctp: create udp4 sock and add its encap_rcv	2020-10-30 15:23:52 -07:00
Makefile
objcnt.c
offload.c	sctp: remove the NETIF_F_SG flag before calling skb_segment	2021-01-16 19:05:59 -08:00
output.c	sctp: allow IP fragmentation when PLPMTUD enters Error state	2021-11-18 19:16:43 +01:00
outqueue.c	sctp: do the basic send and recv for PLPMTUD probe	2021-06-22 11:28:52 -07:00
primitive.c
proc.c	net: fix iteration for sctp transport seq_files	2021-02-08 10:15:49 -08:00
protocol.c	sctp: move 198 addresses from unusable to private scope	2021-07-01 11:47:13 -07:00
sm_make_chunk.c	sctp: account stream padding length for reconf chunk	2021-10-14 07:15:22 -07:00
sm_sideeffect.c	sctp: add the probe timer in transport for PLPMTUD	2021-06-22 11:28:52 -07:00
sm_statefuns.c	sctp: add vtag check in sctp_sf_ootb	2021-10-22 12:36:45 -07:00
sm_statetable.c	sctp: add the probe timer in transport for PLPMTUD	2021-06-22 11:28:52 -07:00
socket.c	sctp: hold endpoint before calling cb in sctp_transport_lookup_process	2022-01-11 15:35:14 +01:00
stream.c
stream_interleave.c
stream_sched.c
stream_sched_prio.c
stream_sched_rr.c
sysctl.c	sctp: add probe_interval in sysctl and sock/asoc/transport	2021-06-22 11:28:51 -07:00
transport.c	sctp: return true only for pathmtu update in sctp_transport_pl_toobig	2021-11-18 19:16:43 +01:00
tsnmap.c	net: sctp: trivial: fix typo in comment	2021-03-04 13:48:32 -08:00
ulpevent.c
ulpqueue.c	net: sctp: ulpqueue.c: delete duplicated word	2020-08-24 16:21:43 -07:00