Kuniyuki Iwashima
3c52c6bb83
tcp/udp: Fix memory leak in ipv6_renew_options().
...
syzbot reported a memory leak [0] related to IPV6_ADDRFORM.
The scenario is that while one thread is converting an IPv6 socket into
IPv4 with IPV6_ADDRFORM, another thread calls do_ipv6_setsockopt() and
allocates memory to inet6_sk(sk)->XXX after conversion.
Then, the converted sk with (tcp|udp)_prot never frees the IPv6 resources,
which inet6_destroy_sock() should have cleaned up.
setsockopt(IPV6_ADDRFORM) setsockopt(IPV6_DSTOPTS)
+-----------------------+ +----------------------+
- do_ipv6_setsockopt(sk, ...)
- sockopt_lock_sock(sk) - do_ipv6_setsockopt(sk, ...)
- lock_sock(sk) ^._ called via tcpv6_prot
- WRITE_ONCE(sk->sk_prot, &tcp_prot) before WRITE_ONCE()
- xchg(&np->opt, NULL)
- txopt_put(opt)
- sockopt_release_sock(sk)
- release_sock(sk) - sockopt_lock_sock(sk)
- lock_sock(sk)
- ipv6_set_opt_hdr(sk, ...)
- ipv6_update_options(sk, opt)
- xchg(&inet6_sk(sk)->opt, opt)
^._ opt is never freed.
- sockopt_release_sock(sk)
- release_sock(sk)
Since IPV6_DSTOPTS allocates options under lock_sock(), we can avoid this
memory leak by testing whether sk_family is changed by IPV6_ADDRFORM after
acquiring the lock.
This issue exists from the initial commit between IPV6_ADDRFORM and
IPV6_PKTOPTIONS.
[0]:
BUG: memory leak
unreferenced object 0xffff888009ab9f80 (size 96):
comm "syz-executor583", pid 328, jiffies 4294916198 (age 13.034s)
hex dump (first 32 bytes):
01 00 00 00 48 00 00 00 08 00 00 00 00 00 00 00 ....H...........
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<000000002ee98ae1>] kmalloc include/linux/slab.h:605 [inline]
[<000000002ee98ae1>] sock_kmalloc+0xb3/0x100 net/core/sock.c:2566
[<0000000065d7b698>] ipv6_renew_options+0x21e/0x10b0 net/ipv6/exthdrs.c:1318
[<00000000a8c756d7>] ipv6_set_opt_hdr net/ipv6/ipv6_sockglue.c:354 [inline]
[<00000000a8c756d7>] do_ipv6_setsockopt.constprop.0+0x28b7/0x4350 net/ipv6/ipv6_sockglue.c:668
[<000000002854d204>] ipv6_setsockopt+0xdf/0x190 net/ipv6/ipv6_sockglue.c:1021
[<00000000e69fdcf8>] tcp_setsockopt+0x13b/0x2620 net/ipv4/tcp.c:3789
[<0000000090da4b9b>] __sys_setsockopt+0x239/0x620 net/socket.c:2252
[<00000000b10d192f>] __do_sys_setsockopt net/socket.c:2263 [inline]
[<00000000b10d192f>] __se_sys_setsockopt net/socket.c:2260 [inline]
[<00000000b10d192f>] __x64_sys_setsockopt+0xbe/0x160 net/socket.c:2260
[<000000000a80d7aa>] do_syscall_x64 arch/x86/entry/common.c:50 [inline]
[<000000000a80d7aa>] do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80
[<000000004562b5c6>] entry_SYSCALL_64_after_hwframe+0x63/0xcd
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2022-10-12 17:50:37 -07:00
..
2022-08-29 12:47:15 +01:00
2022-10-12 14:08:15 +02:00
2022-06-09 21:52:55 -07:00
2022-09-05 10:07:05 +01:00
2020-11-25 11:20:16 -08:00
2022-09-22 13:02:10 -07:00
2022-09-29 07:17:59 +02:00
2020-07-30 16:30:55 -07:00
2021-03-04 15:26:57 -08:00
2022-05-16 10:31:05 +01:00
2022-08-29 10:20:58 +02:00
2022-10-03 07:52:13 +01:00
2022-04-13 13:09:57 +01:00
2022-02-08 20:41:34 -08:00
2020-06-20 21:33:57 -07:00
2022-07-13 12:56:49 +01:00
2020-11-23 18:36:21 -05:00
2022-09-20 10:21:49 -07:00
2022-02-04 20:24:45 -08:00
2022-08-29 12:47:15 +01:00
2022-01-20 20:18:37 -08:00
2022-02-16 20:37:47 -08:00
2022-08-22 17:59:42 -07:00
2021-02-23 11:29:52 -08:00
2022-07-15 18:50:35 -07:00
2022-09-30 12:31:46 +01:00
2022-09-28 18:51:25 -07:00
2022-10-03 07:59:06 +01:00
2020-06-01 14:57:14 -07:00
2022-09-30 13:10:44 +01:00
2022-09-22 13:02:10 -07:00
2022-09-29 07:18:00 +02:00
2022-10-12 17:50:37 -07:00
2022-07-15 16:43:59 +08:00
2021-09-28 13:13:40 +01:00
2021-04-27 14:02:06 -07:00
2022-09-02 20:34:31 -07:00
2022-09-29 07:18:01 +02:00
2022-08-15 11:40:28 +01:00
2022-05-16 13:03:29 +02:00
2021-05-31 22:12:08 -07:00
2022-10-12 09:10:02 +01:00
2020-11-09 15:34:44 -08:00
2022-06-22 18:48:08 -07:00
2022-03-03 14:38:48 +00:00
2022-07-14 15:27:35 -07:00
2020-12-08 16:22:54 -08:00
2020-10-30 12:12:52 -07:00
2022-06-28 21:23:30 -07:00
2022-07-29 12:14:03 +01:00
2022-09-20 12:33:22 +02:00
2022-09-08 18:38:30 +02:00
2022-10-03 07:59:06 +01:00
2022-07-18 12:21:54 +01:00
2022-05-03 10:15:06 +02:00
2022-09-23 21:00:25 -07:00
2021-11-16 13:16:54 +00:00
2020-07-09 12:52:37 +02:00
2022-04-12 15:00:25 +02:00
2021-11-24 17:21:42 -08:00
2022-09-27 18:05:03 -07:00
2022-06-10 16:21:26 -07:00
2022-03-01 12:08:40 +01:00
2022-06-09 21:52:55 -07:00
2022-09-29 07:18:00 +02:00