Skip to content

Commit 152c540

Browse files
krzkksacilotto
authored andcommitted
nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect
BugLink: https://bugs.launchpad.net/bugs/1932957 commit 4ac06a1 upstream. It's possible to trigger NULL pointer dereference by local unprivileged user, when calling getsockname() after failed bind() (e.g. the bind fails because LLCP_SAP_MAX used as SAP): BUG: kernel NULL pointer dereference, address: 0000000000000000 CPU: 1 PID: 426 Comm: llcp_sock_getna Not tainted 5.13.0-rc2-next-20210521+ #9 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-1 04/01/2014 Call Trace: llcp_sock_getname+0xb1/0xe0 __sys_getpeername+0x95/0xc0 ? lockdep_hardirqs_on_prepare+0xd5/0x180 ? syscall_enter_from_user_mode+0x1c/0x40 __x64_sys_getpeername+0x11/0x20 do_syscall_64+0x36/0x70 entry_SYSCALL_64_after_hwframe+0x44/0xae This can be reproduced with Syzkaller C repro (bind followed by getpeername): https://syzkaller.appspot.com/x/repro.c?x=14def446e00000 Cc: <stable@vger.kernel.org> Fixes: d646960 ("NFC: Initial LLCP support") Reported-by: syzbot+80fb126e7f7d8b1a5914@syzkaller.appspotmail.com Reported-by: butt3rflyh4ck <butterflyhuangxx@gmail.com> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Link: https://lore.kernel.org/r/20210531072138.5219-1-krzysztof.kozlowski@canonical.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
1 parent da91d7f commit 152c540

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

net/nfc/llcp_sock.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
110110
if (!llcp_sock->service_name) {
111111
nfc_llcp_local_put(llcp_sock->local);
112112
llcp_sock->local = NULL;
113+
llcp_sock->dev = NULL;
113114
ret = -ENOMEM;
114115
goto put_dev;
115116
}
@@ -119,6 +120,7 @@ static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
119120
llcp_sock->local = NULL;
120121
kfree(llcp_sock->service_name);
121122
llcp_sock->service_name = NULL;
123+
llcp_sock->dev = NULL;
122124
ret = -EADDRINUSE;
123125
goto put_dev;
124126
}

0 commit comments

Comments
 (0)