* Re: [PATCH] net/x25: Fix null-ptr-deref in x25_disconnect
@ 2020-04-28 17:52 Markus Elfring
0 siblings, 0 replies; 3+ messages in thread
From: Markus Elfring @ 2020-04-28 17:52 UTC (permalink / raw)
To: YueHaibing, linux-x25, netdev
Cc: linux-kernel, Allison Randal, Andrew Hendry, David S. Miller,
Greg Kroah-Hartman, Jakub Kicinski, Thomas Gleixner, Xin Tan,
Xiyu Yang
> We should check null before do x25_neigh_put in x25_disconnect,
> otherwise may cause null-ptr-deref like this:
Will it be clearer to use the term “null pointer dereference”
in the final commit subject?
Regards,
Markus
^ permalink raw reply [flat|nested] 3+ messages in thread
* net test error: KASAN: null-ptr-deref Write in x25_disconnect
@ 2020-04-28 4:58 syzbot
2020-04-28 8:12 ` [PATCH] net/x25: Fix null-ptr-deref " YueHaibing
0 siblings, 1 reply; 3+ messages in thread
From: syzbot @ 2020-04-28 4:58 UTC (permalink / raw)
To: andrew.hendry, davem, gregkh, kuba, linux-kernel, linux-x25,
netdev, syzkaller-bugs, tanxin.ctf, tglx, xiyuyang19
Hello,
syzbot found the following crash on:
HEAD commit: 37255e7a Merge tag 'batadv-net-for-davem-20200427' of git:..
git tree: net
console output: https://syzkaller.appspot.com/x/log.txt?x=12b2e5d8100000
kernel config: https://syzkaller.appspot.com/x/.config?x=b7a70e992f2f9b68
dashboard link: https://syzkaller.appspot.com/bug?extid=6db548b615e5aeefdce2
compiler: gcc (GCC) 9.0.0 20181231 (experimental)
Unfortunately, I don't have any reproducer for this crash yet.
IMPORTANT: if you fix the bug, please add the following tag to the commit:
Reported-by: syzbot+6db548b615e5aeefdce2@syzkaller.appspotmail.com
can: request_module (can-proto-0) failed.
can: request_module (can-proto-0) failed.
can: request_module (can-proto-0) failed.
==================================================================
BUG: KASAN: null-ptr-deref in atomic_fetch_sub include/asm-generic/atomic-instrumented.h:199 [inline]
BUG: KASAN: null-ptr-deref in refcount_sub_and_test include/linux/refcount.h:266 [inline]
BUG: KASAN: null-ptr-deref in refcount_dec_and_test include/linux/refcount.h:294 [inline]
BUG: KASAN: null-ptr-deref in x25_neigh_put include/net/x25.h:253 [inline]
BUG: KASAN: null-ptr-deref in x25_disconnect+0x253/0x370 net/x25/x25_subr.c:361
Write of size 4 at addr 00000000000000d8 by task syz-fuzzer/7147
CPU: 0 PID: 7147 Comm: syz-fuzzer Not tainted 5.7.0-rc2-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
Call Trace:
__dump_stack lib/dump_stack.c:77 [inline]
dump_stack+0x188/0x20d lib/dump_stack.c:118
__kasan_report.cold+0x5/0x4d mm/kasan/report.c:515
kasan_report+0x33/0x50 mm/kasan/common.c:625
check_memory_region_inline mm/kasan/generic.c:187 [inline]
check_memory_region+0x141/0x190 mm/kasan/generic.c:193
atomic_fetch_sub include/asm-generic/atomic-instrumented.h:199 [inline]
refcount_sub_and_test include/linux/refcount.h:266 [inline]
refcount_dec_and_test include/linux/refcount.h:294 [inline]
x25_neigh_put include/net/x25.h:253 [inline]
x25_disconnect+0x253/0x370 net/x25/x25_subr.c:361
x25_release+0x345/0x420 net/x25/af_x25.c:665
__sock_release+0xcd/0x280 net/socket.c:605
sock_close+0x18/0x20 net/socket.c:1283
__fput+0x33e/0x880 fs/file_table.c:280
task_work_run+0xf4/0x1b0 kernel/task_work.c:123
tracehook_notify_resume include/linux/tracehook.h:188 [inline]
exit_to_usermode_loop+0x2fa/0x360 arch/x86/entry/common.c:165
prepare_exit_to_usermode arch/x86/entry/common.c:196 [inline]
syscall_return_slowpath arch/x86/entry/common.c:279 [inline]
do_syscall_64+0x6b1/0x7d0 arch/x86/entry/common.c:305
entry_SYSCALL_64_after_hwframe+0x49/0xb3
RIP: 0033:0x4afb40
Code: 8b 7c 24 10 48 8b 74 24 18 48 8b 54 24 20 49 c7 c2 00 00 00 00 49 c7 c0 00 00 00 00 49 c7 c1 00 00 00 00 48 8b 44 24 08 0f 05 <48> 3d 01 f0 ff ff 76 20 48 c7 44 24 28 ff ff ff ff 48 c7 44 24 30
RSP: 002b:000000c0001e94f8 EFLAGS: 00000216 ORIG_RAX: 0000000000000003
RAX: 0000000000000000 RBX: 000000c00002c000 RCX: 00000000004afb40
RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000003
RBP: 000000c0001e9538 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000216 R12: ffffffffffffffff
R13: 0000000000000164 R14: 0000000000000163 R15: 0000000000000200
==================================================================
---
This bug 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 bug report. See:
https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] net/x25: Fix null-ptr-deref in x25_disconnect
2020-04-28 4:58 net test error: KASAN: null-ptr-deref Write " syzbot
@ 2020-04-28 8:12 ` YueHaibing
2020-04-28 21:11 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: YueHaibing @ 2020-04-28 8:12 UTC (permalink / raw)
To: andrew.hendry, davem, kuba, allison, tglx, gregkh, tanxin.ctf,
xiyuyang19
Cc: linux-x25, netdev, linux-kernel, YueHaibing
We should check null before do x25_neigh_put in x25_disconnect,
otherwise may cause null-ptr-deref like this:
#include <sys/socket.h>
#include <linux/x25.h>
int main() {
int sck_x25;
sck_x25 = socket(AF_X25, SOCK_SEQPACKET, 0);
close(sck_x25);
return 0;
}
BUG: kernel NULL pointer dereference, address: 00000000000000d8
CPU: 0 PID: 4817 Comm: t2 Not tainted 5.7.0-rc3+ #159
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.9.3-
RIP: 0010:x25_disconnect+0x91/0xe0
Call Trace:
x25_release+0x18a/0x1b0
__sock_release+0x3d/0xc0
sock_close+0x13/0x20
__fput+0x107/0x270
____fput+0x9/0x10
task_work_run+0x6d/0xb0
exit_to_usermode_loop+0x102/0x110
do_syscall_64+0x23c/0x260
entry_SYSCALL_64_after_hwframe+0x49/0xb3
Reported-by: syzbot+6db548b615e5aeefdce2@syzkaller.appspotmail.com
Fixes: 4becb7ee5b3d ("net/x25: Fix x25_neigh refcnt leak when x25 disconnect")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
net/x25/x25_subr.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/net/x25/x25_subr.c b/net/x25/x25_subr.c
index 8b1b06cabcbf..0285aaa1e93c 100644
--- a/net/x25/x25_subr.c
+++ b/net/x25/x25_subr.c
@@ -357,10 +357,12 @@ void x25_disconnect(struct sock *sk, int reason, unsigned char cause,
sk->sk_state_change(sk);
sock_set_flag(sk, SOCK_DEAD);
}
- read_lock_bh(&x25_list_lock);
- x25_neigh_put(x25->neighbour);
- x25->neighbour = NULL;
- read_unlock_bh(&x25_list_lock);
+ if (x25->neighbour) {
+ read_lock_bh(&x25_list_lock);
+ x25_neigh_put(x25->neighbour);
+ x25->neighbour = NULL;
+ read_unlock_bh(&x25_list_lock);
+ }
}
/*
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] net/x25: Fix null-ptr-deref in x25_disconnect
2020-04-28 8:12 ` [PATCH] net/x25: Fix null-ptr-deref " YueHaibing
@ 2020-04-28 21:11 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2020-04-28 21:11 UTC (permalink / raw)
To: yuehaibing
Cc: andrew.hendry, kuba, allison, tglx, gregkh, tanxin.ctf,
xiyuyang19, linux-x25, netdev, linux-kernel
From: YueHaibing <yuehaibing@huawei.com>
Date: Tue, 28 Apr 2020 16:12:08 +0800
> We should check null before do x25_neigh_put in x25_disconnect,
> otherwise may cause null-ptr-deref like this:
...
> Reported-by: syzbot+6db548b615e5aeefdce2@syzkaller.appspotmail.com
> Fixes: 4becb7ee5b3d ("net/x25: Fix x25_neigh refcnt leak when x25 disconnect")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-28 21:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-28 17:52 [PATCH] net/x25: Fix null-ptr-deref in x25_disconnect Markus Elfring
-- strict thread matches above, loose matches on Subject: below --
2020-04-28 4:58 net test error: KASAN: null-ptr-deref Write " syzbot
2020-04-28 8:12 ` [PATCH] net/x25: Fix null-ptr-deref " YueHaibing
2020-04-28 21:11 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).