* [syzbot] general protection fault in tls_init
@ 2021-12-04 9:20 syzbot
2021-12-05 19:27 ` [PATCH mptcp] mptcp: remove tcp ulp setsockopt support Florian Westphal
0 siblings, 1 reply; 10+ messages in thread
From: syzbot @ 2021-12-04 9:20 UTC (permalink / raw)
To: borisp, daniel, davem, john.fastabend, kuba, linux-kernel,
netdev, syzkaller-bugs
Hello,
syzbot found the following issue on:
HEAD commit: 3498e7f2bb41 Merge tag '5.16-rc2-ksmbd-fixes' of git://git..
git tree: upstream
console output: https://syzkaller.appspot.com/x/log.txt?x=17e50a29b00000
kernel config: https://syzkaller.appspot.com/x/.config?x=33f08a46bc9aea3d
dashboard link: https://syzkaller.appspot.com/bug?extid=1fd9b69cde42967d1add
compiler: Debian clang version 11.0.1-2, GNU ld (GNU Binutils for Debian) 2.35.2
Unfortunately, I don't have any reproducer for this issue yet.
IMPORTANT: if you fix the issue, please add the following tag to the commit:
Reported-by: syzbot+1fd9b69cde42967d1add@syzkaller.appspotmail.com
general protection fault, probably for non-canonical address 0xdffffc0000000004: 0000 [#1] PREEMPT SMP KASAN
KASAN: null-ptr-deref in range [0x0000000000000020-0x0000000000000027]
CPU: 1 PID: 1083 Comm: syz-executor.3 Not tainted 5.16.0-rc2-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
RIP: 0010:tls_build_proto net/tls/tls_main.c:776 [inline]
RIP: 0010:tls_init+0x44b/0x940 net/tls/tls_main.c:844
Code: 8d 9d 80 04 00 00 48 89 d8 48 c1 e8 03 42 80 3c 20 00 74 08 48 89 df e8 a3 15 fa f8 48 8b 1b 48 83 c3 20 48 89 d8 48 c1 e8 03 <42> 80 3c 20 00 74 08 48 89 df e8 86 15 fa f8 48 8b 1b ba e0 00 00
RSP: 0018:ffffc90018ba79e8 EFLAGS: 00010202
RAX: 0000000000000004 RBX: 0000000000000020 RCX: 0000000000000000
RDX: 00000000000001b8 RSI: ffffffff8dc8dad8 RDI: ffffffff91040ae0
RBP: ffffffff8dc8d920 R08: dffffc0000000000 R09: fffffbfff2208158
R10: 0000000000000004 R11: 0000000000000000 R12: dffffc0000000000
R13: ffff888077c9b300 R14: 1ffff1100ef93665 R15: ffff888077c9b328
FS: 00007f618497c700(0000) GS:ffff8880b9b00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f5df59d8004 CR3: 00000000a43f0000 CR4: 00000000003506e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<TASK>
__tcp_set_ulp net/ipv4/tcp_ulp.c:139 [inline]
tcp_set_ulp+0x428/0x4c0 net/ipv4/tcp_ulp.c:160
do_tcp_setsockopt+0x455/0x37c0 net/ipv4/tcp.c:3391
mptcp_setsockopt+0x1b47/0x2400 net/mptcp/sockopt.c:638
__sys_setsockopt+0x552/0x980 net/socket.c:2176
__do_sys_setsockopt net/socket.c:2187 [inline]
__se_sys_setsockopt net/socket.c:2184 [inline]
__x64_sys_setsockopt+0xb1/0xc0 net/socket.c:2184
do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x44/0xd0 arch/x86/entry/common.c:80
entry_SYSCALL_64_after_hwframe+0x44/0xae
RIP: 0033:0x7f6187427ae9
Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 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 c7 c1 bc ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007f618497c188 EFLAGS: 00000246 ORIG_RAX: 0000000000000036
RAX: ffffffffffffffda RBX: 00007f618753b020 RCX: 00007f6187427ae9
RDX: 000000000000001f RSI: 0000000000000006 RDI: 0000000000000003
RBP: 00007f6187481f6d R08: 0000000000000004 R09: 0000000000000000
R10: 0000000020000100 R11: 0000000000000246 R12: 0000000000000000
R13: 00007ffe6784d25f R14: 00007f618497c300 R15: 0000000000022000
</TASK>
Modules linked in:
---[ end trace db2630bf612a55f1 ]---
RIP: 0010:tls_build_proto net/tls/tls_main.c:776 [inline]
RIP: 0010:tls_init+0x44b/0x940 net/tls/tls_main.c:844
Code: 8d 9d 80 04 00 00 48 89 d8 48 c1 e8 03 42 80 3c 20 00 74 08 48 89 df e8 a3 15 fa f8 48 8b 1b 48 83 c3 20 48 89 d8 48 c1 e8 03 <42> 80 3c 20 00 74 08 48 89 df e8 86 15 fa f8 48 8b 1b ba e0 00 00
RSP: 0018:ffffc90018ba79e8 EFLAGS: 00010202
RAX: 0000000000000004 RBX: 0000000000000020 RCX: 0000000000000000
RDX: 00000000000001b8 RSI: ffffffff8dc8dad8 RDI: ffffffff91040ae0
RBP: ffffffff8dc8d920 R08: dffffc0000000000 R09: fffffbfff2208158
R10: 0000000000000004 R11: 0000000000000000 R12: dffffc0000000000
R13: ffff888077c9b300 R14: 1ffff1100ef93665 R15: ffff888077c9b328
FS: 00007f618497c700(0000) GS:ffff8880b9a00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000020001580 CR3: 00000000a43f0000 CR4: 00000000003506f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
----------------
Code disassembly (best guess):
0: 8d 9d 80 04 00 00 lea 0x480(%rbp),%ebx
6: 48 89 d8 mov %rbx,%rax
9: 48 c1 e8 03 shr $0x3,%rax
d: 42 80 3c 20 00 cmpb $0x0,(%rax,%r12,1)
12: 74 08 je 0x1c
14: 48 89 df mov %rbx,%rdi
17: e8 a3 15 fa f8 callq 0xf8fa15bf
1c: 48 8b 1b mov (%rbx),%rbx
1f: 48 83 c3 20 add $0x20,%rbx
23: 48 89 d8 mov %rbx,%rax
26: 48 c1 e8 03 shr $0x3,%rax
* 2a: 42 80 3c 20 00 cmpb $0x0,(%rax,%r12,1) <-- trapping instruction
2f: 74 08 je 0x39
31: 48 89 df mov %rbx,%rdi
34: e8 86 15 fa f8 callq 0xf8fa15bf
39: 48 8b 1b mov (%rbx),%rbx
3c: ba .byte 0xba
3d: e0 00 loopne 0x3f
---
This report is generated by a bot. It may contain errors.
See https://goo.gl/tpsmEJ for more information about syzbot.
syzbot engineers can be reached at syzkaller@googlegroups.com.
syzbot will keep track of this issue. See:
https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH mptcp] mptcp: remove tcp ulp setsockopt support
2021-12-04 9:20 [syzbot] general protection fault in tls_init syzbot
@ 2021-12-05 19:27 ` Florian Westphal
2021-12-06 9:44 ` Matthieu Baerts
2021-12-06 15:53 ` Jakub Kicinski
0 siblings, 2 replies; 10+ messages in thread
From: Florian Westphal @ 2021-12-05 19:27 UTC (permalink / raw)
To: mptcp
Cc: syzkaller-bugs, netdev, linux-kernel, Florian Westphal,
syzbot+1fd9b69cde42967d1add
TCP_ULP setsockopt cannot be used for mptcp because its already
used internally to plumb subflow (tcp) sockets to the mptcp layer.
syzbot managed to trigger a crash for mptcp connections that are
in fallback mode:
KASAN: null-ptr-deref in range [0x0000000000000020-0x0000000000000027]
CPU: 1 PID: 1083 Comm: syz-executor.3 Not tainted 5.16.0-rc2-syzkaller #0
RIP: 0010:tls_build_proto net/tls/tls_main.c:776 [inline]
[..]
__tcp_set_ulp net/ipv4/tcp_ulp.c:139 [inline]
tcp_set_ulp+0x428/0x4c0 net/ipv4/tcp_ulp.c:160
do_tcp_setsockopt+0x455/0x37c0 net/ipv4/tcp.c:3391
mptcp_setsockopt+0x1b47/0x2400 net/mptcp/sockopt.c:638
Remove support for TCP_ULP setsockopt.
Reported-by: syzbot+1fd9b69cde42967d1add@syzkaller.appspotmail.com
Signed-off-by: Florian Westphal <fw@strlen.de>
---
diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c
index 3c3db22fd36a..aa3fcd86dbe2 100644
--- a/net/mptcp/sockopt.c
+++ b/net/mptcp/sockopt.c
@@ -543,7 +543,6 @@ static bool mptcp_supported_sockopt(int level, int optname)
case TCP_NODELAY:
case TCP_THIN_LINEAR_TIMEOUTS:
case TCP_CONGESTION:
- case TCP_ULP:
case TCP_CORK:
case TCP_KEEPIDLE:
case TCP_KEEPINTVL:
--
2.32.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH mptcp] mptcp: remove tcp ulp setsockopt support
2021-12-05 19:27 ` [PATCH mptcp] mptcp: remove tcp ulp setsockopt support Florian Westphal
@ 2021-12-06 9:44 ` Matthieu Baerts
2021-12-06 10:58 ` Florian Westphal
2021-12-06 18:47 ` Mat Martineau
2021-12-06 15:53 ` Jakub Kicinski
1 sibling, 2 replies; 10+ messages in thread
From: Matthieu Baerts @ 2021-12-06 9:44 UTC (permalink / raw)
To: Florian Westphal; +Cc: mptcp
Hi Florian,
(without netdev and syzbot ML)
On 05/12/2021 20:27, Florian Westphal wrote:
> TCP_ULP setsockopt cannot be used for mptcp because its already
> used internally to plumb subflow (tcp) sockets to the mptcp layer.
>
> syzbot managed to trigger a crash for mptcp connections that are
> in fallback mode:
>
> KASAN: null-ptr-deref in range [0x0000000000000020-0x0000000000000027]
> CPU: 1 PID: 1083 Comm: syz-executor.3 Not tainted 5.16.0-rc2-syzkaller #0
> RIP: 0010:tls_build_proto net/tls/tls_main.c:776 [inline]
> [..]
> __tcp_set_ulp net/ipv4/tcp_ulp.c:139 [inline]
> tcp_set_ulp+0x428/0x4c0 net/ipv4/tcp_ulp.c:160
> do_tcp_setsockopt+0x455/0x37c0 net/ipv4/tcp.c:3391
> mptcp_setsockopt+0x1b47/0x2400 net/mptcp/sockopt.c:638
>
> Remove support for TCP_ULP setsockopt.
Good catch!
Indeed, it doesn't make sense to support TCP_ULP.
> Reported-by: syzbot+1fd9b69cde42967d1add@syzkaller.appspotmail.com
> Signed-off-by: Florian Westphal <fw@strlen.de>
I guess we need a Fixes tag here:
Fixes: d9e4c1291810 ("mptcp: only admit explicitly supported sockopt")
BTW, did you send this patch to netdev ML on purpose?
I guess this is fine but they will probably ask for the Fixes tag as it
looks like a bug-fix. Do you want me to reply to this email on netdev
and include this "Fixes" tag in my email?
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH mptcp] mptcp: remove tcp ulp setsockopt support
2021-12-06 9:44 ` Matthieu Baerts
@ 2021-12-06 10:58 ` Florian Westphal
2021-12-06 18:47 ` Mat Martineau
1 sibling, 0 replies; 10+ messages in thread
From: Florian Westphal @ 2021-12-06 10:58 UTC (permalink / raw)
To: Matthieu Baerts; +Cc: Florian Westphal, mptcp
Matthieu Baerts <matthieu.baerts@tessares.net> wrote:
> BTW, did you send this patch to netdev ML on purpose?
Yes, it was a reply to syzbot report.
> I guess this is fine but they will probably ask for the Fixes tag as it
> looks like a bug-fix. Do you want me to reply to this email on netdev
> and include this "Fixes" tag in my email?
I think it can go in via mptcp tree.
This patch is fine but there is still another ULP bug left, will send a
patch soon.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH mptcp] mptcp: remove tcp ulp setsockopt support
2021-12-05 19:27 ` [PATCH mptcp] mptcp: remove tcp ulp setsockopt support Florian Westphal
2021-12-06 9:44 ` Matthieu Baerts
@ 2021-12-06 15:53 ` Jakub Kicinski
2021-12-06 15:55 ` Jakub Kicinski
1 sibling, 1 reply; 10+ messages in thread
From: Jakub Kicinski @ 2021-12-06 15:53 UTC (permalink / raw)
To: Florian Westphal
Cc: mptcp, syzkaller-bugs, netdev, linux-kernel, syzbot+1fd9b69cde42967d1add
On Sun, 5 Dec 2021 20:27:00 +0100 Florian Westphal wrote:
> TCP_ULP setsockopt cannot be used for mptcp because its already
> used internally to plumb subflow (tcp) sockets to the mptcp layer.
>
> syzbot managed to trigger a crash for mptcp connections that are
> in fallback mode:
Fallback mode meaning ops are NULL? I'm slightly confused by this
report.
> KASAN: null-ptr-deref in range [0x0000000000000020-0x0000000000000027]
> CPU: 1 PID: 1083 Comm: syz-executor.3 Not tainted 5.16.0-rc2-syzkaller #0
> RIP: 0010:tls_build_proto net/tls/tls_main.c:776 [inline]
> [..]
> __tcp_set_ulp net/ipv4/tcp_ulp.c:139 [inline]
> tcp_set_ulp+0x428/0x4c0 net/ipv4/tcp_ulp.c:160
> do_tcp_setsockopt+0x455/0x37c0 net/ipv4/tcp.c:3391
> mptcp_setsockopt+0x1b47/0x2400 net/mptcp/sockopt.c:638
>
> Remove support for TCP_ULP setsockopt.
>
> Reported-by: syzbot+1fd9b69cde42967d1add@syzkaller.appspotmail.com
> Signed-off-by: Florian Westphal <fw@strlen.de>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH mptcp] mptcp: remove tcp ulp setsockopt support
2021-12-06 15:53 ` Jakub Kicinski
@ 2021-12-06 15:55 ` Jakub Kicinski
2021-12-06 18:44 ` Mat Martineau
0 siblings, 1 reply; 10+ messages in thread
From: Jakub Kicinski @ 2021-12-06 15:55 UTC (permalink / raw)
To: Florian Westphal
Cc: mptcp, syzkaller-bugs, netdev, linux-kernel, syzbot+1fd9b69cde42967d1add
On Mon, 6 Dec 2021 07:53:26 -0800 Jakub Kicinski wrote:
> On Sun, 5 Dec 2021 20:27:00 +0100 Florian Westphal wrote:
> > TCP_ULP setsockopt cannot be used for mptcp because its already
> > used internally to plumb subflow (tcp) sockets to the mptcp layer.
> >
> > syzbot managed to trigger a crash for mptcp connections that are
> > in fallback mode:
>
> Fallback mode meaning ops are NULL? I'm slightly confused by this
> report.
Ah, it's the socket not the ops.
> > KASAN: null-ptr-deref in range [0x0000000000000020-0x0000000000000027]
> > CPU: 1 PID: 1083 Comm: syz-executor.3 Not tainted 5.16.0-rc2-syzkaller #0
> > RIP: 0010:tls_build_proto net/tls/tls_main.c:776 [inline]
> > [..]
> > __tcp_set_ulp net/ipv4/tcp_ulp.c:139 [inline]
> > tcp_set_ulp+0x428/0x4c0 net/ipv4/tcp_ulp.c:160
> > do_tcp_setsockopt+0x455/0x37c0 net/ipv4/tcp.c:3391
> > mptcp_setsockopt+0x1b47/0x2400 net/mptcp/sockopt.c:638
> >
> > Remove support for TCP_ULP setsockopt.
> >
> > Reported-by: syzbot+1fd9b69cde42967d1add@syzkaller.appspotmail.com
> > Signed-off-by: Florian Westphal <fw@strlen.de>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH mptcp] mptcp: remove tcp ulp setsockopt support
2021-12-06 15:55 ` Jakub Kicinski
@ 2021-12-06 18:44 ` Mat Martineau
2021-12-06 18:57 ` Jakub Kicinski
0 siblings, 1 reply; 10+ messages in thread
From: Mat Martineau @ 2021-12-06 18:44 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Florian Westphal, mptcp, syzkaller-bugs, netdev, linux-kernel,
syzbot+1fd9b69cde42967d1add
On Mon, 6 Dec 2021, Jakub Kicinski wrote:
> On Mon, 6 Dec 2021 07:53:26 -0800 Jakub Kicinski wrote:
>> On Sun, 5 Dec 2021 20:27:00 +0100 Florian Westphal wrote:
>>> TCP_ULP setsockopt cannot be used for mptcp because its already
>>> used internally to plumb subflow (tcp) sockets to the mptcp layer.
>>>
>>> syzbot managed to trigger a crash for mptcp connections that are
>>> in fallback mode:
>>
>> Fallback mode meaning ops are NULL? I'm slightly confused by this
>> report.
>
> Ah, it's the socket not the ops.
>
>>> KASAN: null-ptr-deref in range [0x0000000000000020-0x0000000000000027]
>>> CPU: 1 PID: 1083 Comm: syz-executor.3 Not tainted 5.16.0-rc2-syzkaller #0
>>> RIP: 0010:tls_build_proto net/tls/tls_main.c:776 [inline]
>>> [..]
>>> __tcp_set_ulp net/ipv4/tcp_ulp.c:139 [inline]
>>> tcp_set_ulp+0x428/0x4c0 net/ipv4/tcp_ulp.c:160
>>> do_tcp_setsockopt+0x455/0x37c0 net/ipv4/tcp.c:3391
>>> mptcp_setsockopt+0x1b47/0x2400 net/mptcp/sockopt.c:638
>>>
>>> Remove support for TCP_ULP setsockopt.
>>>
>>> Reported-by: syzbot+1fd9b69cde42967d1add@syzkaller.appspotmail.com
>>> Signed-off-by: Florian Westphal <fw@strlen.de>
Jakub -
If you could mark this as "Not Applicable" in netdevbpf patchwork, we'll
apply it to the mptcp tree and resubmit to netdev with some related
patches.
Thanks,
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH mptcp] mptcp: remove tcp ulp setsockopt support
2021-12-06 9:44 ` Matthieu Baerts
2021-12-06 10:58 ` Florian Westphal
@ 2021-12-06 18:47 ` Mat Martineau
2021-12-07 13:23 ` Matthieu Baerts
1 sibling, 1 reply; 10+ messages in thread
From: Mat Martineau @ 2021-12-06 18:47 UTC (permalink / raw)
To: Matthieu Baerts; +Cc: Florian Westphal, mptcp
On Mon, 6 Dec 2021, Matthieu Baerts wrote:
> Hi Florian,
>
> (without netdev and syzbot ML)
>
> On 05/12/2021 20:27, Florian Westphal wrote:
>> TCP_ULP setsockopt cannot be used for mptcp because its already
>> used internally to plumb subflow (tcp) sockets to the mptcp layer.
>>
>> syzbot managed to trigger a crash for mptcp connections that are
>> in fallback mode:
>>
>> KASAN: null-ptr-deref in range [0x0000000000000020-0x0000000000000027]
>> CPU: 1 PID: 1083 Comm: syz-executor.3 Not tainted 5.16.0-rc2-syzkaller #0
>> RIP: 0010:tls_build_proto net/tls/tls_main.c:776 [inline]
>> [..]
>> __tcp_set_ulp net/ipv4/tcp_ulp.c:139 [inline]
>> tcp_set_ulp+0x428/0x4c0 net/ipv4/tcp_ulp.c:160
>> do_tcp_setsockopt+0x455/0x37c0 net/ipv4/tcp.c:3391
>> mptcp_setsockopt+0x1b47/0x2400 net/mptcp/sockopt.c:638
>>
>> Remove support for TCP_ULP setsockopt.
>
> Good catch!
> Indeed, it doesn't make sense to support TCP_ULP.
>
>> Reported-by: syzbot+1fd9b69cde42967d1add@syzkaller.appspotmail.com
>> Signed-off-by: Florian Westphal <fw@strlen.de>
>
> I guess we need a Fixes tag here:
>
> Fixes: d9e4c1291810 ("mptcp: only admit explicitly supported sockopt")
>
Thanks Florian.
Matthieu, could you apply this to the export branch with your suggested
Fixes tag?
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH mptcp] mptcp: remove tcp ulp setsockopt support
2021-12-06 18:44 ` Mat Martineau
@ 2021-12-06 18:57 ` Jakub Kicinski
0 siblings, 0 replies; 10+ messages in thread
From: Jakub Kicinski @ 2021-12-06 18:57 UTC (permalink / raw)
To: Mat Martineau
Cc: Florian Westphal, mptcp, syzkaller-bugs, netdev, linux-kernel,
syzbot+1fd9b69cde42967d1add
On Mon, 6 Dec 2021 10:44:16 -0800 (PST) Mat Martineau wrote:
> If you could mark this as "Not Applicable" in netdevbpf patchwork, we'll
> apply it to the mptcp tree and resubmit to netdev with some related
> patches.
For sure, I was asking because technically I added the code that hit
the oops to tls a week or so ago, so I wanted to make sure it's not
my fault ;) Marked in pw appropriately now.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH mptcp] mptcp: remove tcp ulp setsockopt support
2021-12-06 18:47 ` Mat Martineau
@ 2021-12-07 13:23 ` Matthieu Baerts
0 siblings, 0 replies; 10+ messages in thread
From: Matthieu Baerts @ 2021-12-07 13:23 UTC (permalink / raw)
To: Mat Martineau; +Cc: Florian Westphal, mptcp
Hi Mat,
On 06/12/2021 19:47, Mat Martineau wrote:
> On Mon, 6 Dec 2021, Matthieu Baerts wrote:
>
>> Hi Florian,
>>
>> (without netdev and syzbot ML)
>>
>> On 05/12/2021 20:27, Florian Westphal wrote:
>>> TCP_ULP setsockopt cannot be used for mptcp because its already
>>> used internally to plumb subflow (tcp) sockets to the mptcp layer.
>>>
>>> syzbot managed to trigger a crash for mptcp connections that are
>>> in fallback mode:
>>>
>>> KASAN: null-ptr-deref in range [0x0000000000000020-0x0000000000000027]
>>> CPU: 1 PID: 1083 Comm: syz-executor.3 Not tainted
>>> 5.16.0-rc2-syzkaller #0
>>> RIP: 0010:tls_build_proto net/tls/tls_main.c:776 [inline]
>>> [..]
>>> __tcp_set_ulp net/ipv4/tcp_ulp.c:139 [inline]
>>> tcp_set_ulp+0x428/0x4c0 net/ipv4/tcp_ulp.c:160
>>> do_tcp_setsockopt+0x455/0x37c0 net/ipv4/tcp.c:3391
>>> mptcp_setsockopt+0x1b47/0x2400 net/mptcp/sockopt.c:638
>>>
>>> Remove support for TCP_ULP setsockopt.
>>
>> Good catch!
>> Indeed, it doesn't make sense to support TCP_ULP.
>>
>>> Reported-by: syzbot+1fd9b69cde42967d1add@syzkaller.appspotmail.com
>>> Signed-off-by: Florian Westphal <fw@strlen.de>
>>
>> I guess we need a Fixes tag here:
>>
>> Fixes: d9e4c1291810 ("mptcp: only admit explicitly supported sockopt")
>>
>
> Thanks Florian.
>
> Matthieu, could you apply this to the export branch with your suggested
> Fixes tag?
>
> Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Sure, just did:
- 13dc812544f7: mptcp: remove tcp ulp setsockopt support
- Results: 5fd3630ba52a..4be3d8d5b45c
Builds and tests are now in progress:
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20211207T132312
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-12-07 13:23 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-04 9:20 [syzbot] general protection fault in tls_init syzbot
2021-12-05 19:27 ` [PATCH mptcp] mptcp: remove tcp ulp setsockopt support Florian Westphal
2021-12-06 9:44 ` Matthieu Baerts
2021-12-06 10:58 ` Florian Westphal
2021-12-06 18:47 ` Mat Martineau
2021-12-07 13:23 ` Matthieu Baerts
2021-12-06 15:53 ` Jakub Kicinski
2021-12-06 15:55 ` Jakub Kicinski
2021-12-06 18:44 ` Mat Martineau
2021-12-06 18:57 ` Jakub Kicinski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.