* net/can: warning in bcm_connect/proc_register
@ 2016-10-24 16:21 Andrey Konovalov
2016-10-24 16:58 ` Cong Wang
0 siblings, 1 reply; 4+ messages in thread
From: Andrey Konovalov @ 2016-10-24 16:21 UTC (permalink / raw)
To: Oliver Hartkopp, Marc Kleine-Budde, David S. Miller, linux-can,
netdev, LKML
Cc: syzkaller, Kostya Serebryany, Alexander Potapenko, Dmitry Vyukov,
Eric Dumazet
Hi,
I've got the following error report while running the syzkaller fuzzer:
WARNING: CPU: 0 PID: 32451 at fs/proc/generic.c:345 proc_register+0x25e/0x300
proc_dir_entry 'can-bcm/249757' already registered
Kernel panic - not syncing: panic_on_warn set ...
CPU: 0 PID: 32451 Comm: syz-executor Not tainted 4.9.0-rc1+ #293
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011
ffff880037d8fae0 ffffffff81b474f4 0000000000000003 dffffc0000000000
ffffffff840cbf00 ffff880037d8fb04 ffff880037d8fba8 ffffffff8140c06a
0000000041b58ab3 ffffffff8479ab7d ffffffff8140beae ffffffff00000032
Call Trace:
[< inline >] __dump_stack lib/dump_stack.c:15
[<ffffffff81b474f4>] dump_stack+0xb3/0x10f lib/dump_stack.c:51
[<ffffffff8140c06a>] panic+0x1bc/0x39d kernel/panic.c:179
[<ffffffff8111125c>] __warn+0x1cc/0x1f0 kernel/panic.c:542
[<ffffffff8111132c>] warn_slowpath_fmt+0xac/0xd0 kernel/panic.c:565
[<ffffffff8167d6ee>] proc_register+0x25e/0x300 fs/proc/generic.c:344
[<ffffffff8167dc01>] proc_create_data+0x101/0x1a0 fs/proc/generic.c:507
[<ffffffff835729ce>] bcm_connect+0x16e/0x380 net/can/bcm.c:1585
[<ffffffff82b725e4>] SYSC_connect+0x244/0x2f0 net/socket.c:1533
[<ffffffff82b74dd4>] SyS_connect+0x24/0x30 net/socket.c:1514
[<ffffffff83fc19c1>] entry_SYSCALL_64_fastpath+0x1f/0xc2
Dumping ftrace buffer:
(ftrace buffer empty)
Kernel Offset: disabled
On commit 07d9a380680d1c0eb51ef87ff2eab5c994949e69 (Oct 23).
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: net/can: warning in bcm_connect/proc_register
2016-10-24 16:21 net/can: warning in bcm_connect/proc_register Andrey Konovalov
@ 2016-10-24 16:58 ` Cong Wang
2016-10-24 17:31 ` Andrey Konovalov
0 siblings, 1 reply; 4+ messages in thread
From: Cong Wang @ 2016-10-24 16:58 UTC (permalink / raw)
To: Andrey Konovalov
Cc: Oliver Hartkopp, Marc Kleine-Budde, David S. Miller, linux-can,
netdev, LKML, syzkaller, Kostya Serebryany, Alexander Potapenko,
Dmitry Vyukov, Eric Dumazet
On Mon, Oct 24, 2016 at 9:21 AM, Andrey Konovalov <andreyknvl@google.com> wrote:
> Hi,
>
> I've got the following error report while running the syzkaller fuzzer:
>
> WARNING: CPU: 0 PID: 32451 at fs/proc/generic.c:345 proc_register+0x25e/0x300
> proc_dir_entry 'can-bcm/249757' already registered
> Kernel panic - not syncing: panic_on_warn set ...
Looks like we have two problems here:
1) A check for bo->bcm_proc_read != NULL seems missing
2) We need to lock the sock in bcm_connect().
I will work on a patch. Meanwhile, it would help a lot if you could provide
a reproducer.
Thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: net/can: warning in bcm_connect/proc_register
2016-10-24 16:58 ` Cong Wang
@ 2016-10-24 17:31 ` Andrey Konovalov
2016-10-24 18:23 ` Oliver Hartkopp
0 siblings, 1 reply; 4+ messages in thread
From: Andrey Konovalov @ 2016-10-24 17:31 UTC (permalink / raw)
To: Cong Wang
Cc: Oliver Hartkopp, Marc Kleine-Budde, David S. Miller, linux-can,
netdev, LKML, syzkaller, Kostya Serebryany, Alexander Potapenko,
Dmitry Vyukov, Eric Dumazet
Hi Cong,
I'm able to reproduce it by running
https://gist.github.com/xairy/33f2eb6bf807b004e643bae36c3d02d7 in a
tight parallel loop with stress
(https://godoc.org/golang.org/x/tools/cmd/stress):
$ gcc -lpthread tmp.c
$ ./stress ./a.out
The C program was generated from the following syzkaller prog:
mmap(&(0x7f0000000000/0x991000)=nil, (0x991000), 0x3, 0x32,
0xffffffffffffffff, 0x0)
socket(0x1d, 0x80002, 0x2)
r0 = socket(0x1d, 0x80002, 0x2)
connect$nfc_llcp(r0, &(0x7f000000c000)={0x27, 0x100000000, 0x0, 0x5,
0x100000000, 0x1,
"341b3a01b257849ca1d7d1ff9f999d8127b185f88d1d775d59c88a3aa6a8ddacdf2bdc324ea6578a21b85114610186c3817c34b05eaffd2c3f54f57fa81ba0",
0x1ff}, 0x60)
connect$nfc_llcp(r0, &(0x7f0000991000-0x60)={0x27, 0x100000000, 0x1,
0x5, 0xfffffffffffffffd, 0x0,
"341b3a01b257849ca1d7d1ff9f999d8127b185f88d1d775dbec88a3aa6a8ddacdf2bdc324ea6578a21b85114610186c3817c34b05eaffd2c3f54f57fa81ba0",
0x1ff}, 0x60)
Unfortunately I wasn't able to create a simpler reproducer.
Thanks!
On Mon, Oct 24, 2016 at 6:58 PM, Cong Wang <xiyou.wangcong@gmail.com> wrote:
> On Mon, Oct 24, 2016 at 9:21 AM, Andrey Konovalov <andreyknvl@google.com> wrote:
>> Hi,
>>
>> I've got the following error report while running the syzkaller fuzzer:
>>
>> WARNING: CPU: 0 PID: 32451 at fs/proc/generic.c:345 proc_register+0x25e/0x300
>> proc_dir_entry 'can-bcm/249757' already registered
>> Kernel panic - not syncing: panic_on_warn set ...
>
> Looks like we have two problems here:
>
> 1) A check for bo->bcm_proc_read != NULL seems missing
> 2) We need to lock the sock in bcm_connect().
>
> I will work on a patch. Meanwhile, it would help a lot if you could provide
> a reproducer.
>
> Thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: net/can: warning in bcm_connect/proc_register
2016-10-24 17:31 ` Andrey Konovalov
@ 2016-10-24 18:23 ` Oliver Hartkopp
0 siblings, 0 replies; 4+ messages in thread
From: Oliver Hartkopp @ 2016-10-24 18:23 UTC (permalink / raw)
To: Andrey Konovalov, Cong Wang
Cc: Marc Kleine-Budde, David S. Miller, linux-can, netdev, LKML,
syzkaller, Kostya Serebryany, Alexander Potapenko, Dmitry Vyukov,
Eric Dumazet
Hello Andrey, hello Cong,
thanks for catching this issue.
I added lock_sock() and a check for a failing proc_create_data() below.
Can you please check if it solved the issue?
I tested the patched version with the stress tool as advised by Andrey
and did not see any problems in dmesg anymore.
If ok I can provide a proper patch.
Many thanks,
Oliver
diff --git a/net/can/bcm.c b/net/can/bcm.c
index 8e999ff..8af9d25 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -1549,24 +1549,31 @@ static int bcm_connect(struct socket *sock,
struct sockaddr *uaddr, int len,
struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;
struct sock *sk = sock->sk;
struct bcm_sock *bo = bcm_sk(sk);
+ int ret = 0;
if (len < sizeof(*addr))
return -EINVAL;
- if (bo->bound)
- return -EISCONN;
+ lock_sock(sk);
+
+ if (bo->bound) {
+ ret = -EISCONN;
+ goto fail;
+ }
/* bind a device to this socket */
if (addr->can_ifindex) {
struct net_device *dev;
dev = dev_get_by_index(&init_net, addr->can_ifindex);
- if (!dev)
- return -ENODEV;
-
+ if (!dev) {
+ ret = -ENODEV;
+ goto fail;
+ }
if (dev->type != ARPHRD_CAN) {
dev_put(dev);
- return -ENODEV;
+ ret = -ENODEV;
+ goto fail;
}
bo->ifindex = dev->ifindex;
@@ -1577,17 +1584,24 @@ static int bcm_connect(struct socket *sock,
struct sockaddr *uaddr, int len,
bo->ifindex = 0;
}
- bo->bound = 1;
-
if (proc_dir) {
/* unique socket address as filename */
sprintf(bo->procname, "%lu", sock_i_ino(sk));
bo->bcm_proc_read = proc_create_data(bo->procname, 0644,
proc_dir,
&bcm_proc_fops, sk);
+ if (!bo->bcm_proc_read) {
+ ret = -ENOMEM;
+ goto fail;
+ }
}
- return 0;
+ bo->bound = 1;
+
+fail:
+ release_sock(sk);
+
+ return ret;
}
static int bcm_recvmsg(struct socket *sock, struct msghdr *msg, size_t
size,
On 10/24/2016 07:31 PM, Andrey Konovalov wrote:
> Hi Cong,
>
> I'm able to reproduce it by running
> https://gist.github.com/xairy/33f2eb6bf807b004e643bae36c3d02d7 in a
> tight parallel loop with stress
> (https://godoc.org/golang.org/x/tools/cmd/stress):
> $ gcc -lpthread tmp.c
> $ ./stress ./a.out
>
> The C program was generated from the following syzkaller prog:
> mmap(&(0x7f0000000000/0x991000)=nil, (0x991000), 0x3, 0x32,
> 0xffffffffffffffff, 0x0)
> socket(0x1d, 0x80002, 0x2)
> r0 = socket(0x1d, 0x80002, 0x2)
> connect$nfc_llcp(r0, &(0x7f000000c000)={0x27, 0x100000000, 0x0, 0x5,
> 0x100000000, 0x1,
> "341b3a01b257849ca1d7d1ff9f999d8127b185f88d1d775d59c88a3aa6a8ddacdf2bdc324ea6578a21b85114610186c3817c34b05eaffd2c3f54f57fa81ba0",
> 0x1ff}, 0x60)
> connect$nfc_llcp(r0, &(0x7f0000991000-0x60)={0x27, 0x100000000, 0x1,
> 0x5, 0xfffffffffffffffd, 0x0,
> "341b3a01b257849ca1d7d1ff9f999d8127b185f88d1d775dbec88a3aa6a8ddacdf2bdc324ea6578a21b85114610186c3817c34b05eaffd2c3f54f57fa81ba0",
> 0x1ff}, 0x60)
>
> Unfortunately I wasn't able to create a simpler reproducer.
>
> Thanks!
>
> On Mon, Oct 24, 2016 at 6:58 PM, Cong Wang <xiyou.wangcong@gmail.com> wrote:
>> On Mon, Oct 24, 2016 at 9:21 AM, Andrey Konovalov <andreyknvl@google.com> wrote:
>>> Hi,
>>>
>>> I've got the following error report while running the syzkaller fuzzer:
>>>
>>> WARNING: CPU: 0 PID: 32451 at fs/proc/generic.c:345 proc_register+0x25e/0x300
>>> proc_dir_entry 'can-bcm/249757' already registered
>>> Kernel panic - not syncing: panic_on_warn set ...
>>
>> Looks like we have two problems here:
>>
>> 1) A check for bo->bcm_proc_read != NULL seems missing
>> 2) We need to lock the sock in bcm_connect().
>>
>> I will work on a patch. Meanwhile, it would help a lot if you could provide
>> a reproducer.
>>
>> Thanks!
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-10-24 18:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-24 16:21 net/can: warning in bcm_connect/proc_register Andrey Konovalov
2016-10-24 16:58 ` Cong Wang
2016-10-24 17:31 ` Andrey Konovalov
2016-10-24 18:23 ` Oliver Hartkopp
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.