* WARNING in gpio_to_desc
@ 2019-07-10 11:07 syzbot
2019-07-16 21:52 ` Linus Walleij
0 siblings, 1 reply; 6+ messages in thread
From: syzbot @ 2019-07-10 11:07 UTC (permalink / raw)
To: andreyknvl, bgolaszewski, linus.walleij, linux-gpio,
linux-kernel, linux-usb, syzkaller-bugs
Hello,
syzbot found the following crash on:
HEAD commit: 7829a896 usb-fuzzer: main usb gadget fuzzer driver
git tree: https://github.com/google/kasan.git usb-fuzzer
console output: https://syzkaller.appspot.com/x/log.txt?x=136a97d8600000
kernel config: https://syzkaller.appspot.com/x/.config?x=f6d4561982f71f63
dashboard link: https://syzkaller.appspot.com/bug?extid=cf35b76f35e068a1107f
compiler: gcc (GCC) 9.0.0 20181231 (experimental)
syz repro: https://syzkaller.appspot.com/x/repro.syz?x=15660838600000
C reproducer: https://syzkaller.appspot.com/x/repro.c?x=15ff38cfa00000
IMPORTANT: if you fix the bug, please add the following tag to the commit:
Reported-by: syzbot+cf35b76f35e068a1107f@syzkaller.appspotmail.com
usb 1-1: config 0 interface 60 altsetting 0 bulk endpoint 0x2 has invalid
maxpacket 0
usb 1-1: New USB device found, idVendor=1286, idProduct=2046,
bcdDevice=33.1a
usb 1-1: New USB device strings: Mfr=0, Product=0, SerialNumber=0
usb 1-1: config 0 descriptor??
usb 1-1: NFC: intf 000000003523355a id 0000000011a20f39
nfcmrvl 1-1:0.60: NFC: failed to request reset_n io
------------[ cut here ]------------
invalid GPIO -22
WARNING: CPU: 1 PID: 21 at drivers/gpio/gpiolib.c:124 gpio_to_desc
drivers/gpio/gpiolib.c:124 [inline]
WARNING: CPU: 1 PID: 21 at drivers/gpio/gpiolib.c:124
gpio_to_desc+0x152/0x1f0 drivers/gpio/gpiolib.c:106
Kernel panic - not syncing: panic_on_warn set ...
CPU: 1 PID: 21 Comm: kworker/1:1 Not tainted 5.2.0-rc6+ #13
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS
Google 01/01/2011
Workqueue: usb_hub_wq hub_event
Call Trace:
__dump_stack lib/dump_stack.c:77 [inline]
dump_stack+0xca/0x13e lib/dump_stack.c:113
panic+0x292/0x6c9 kernel/panic.c:219
__warn.cold+0x20/0x4b kernel/panic.c:576
report_bug+0x262/0x2a0 lib/bug.c:186
fixup_bug arch/x86/kernel/traps.c:179 [inline]
fixup_bug arch/x86/kernel/traps.c:174 [inline]
do_error_trap+0x12b/0x1e0 arch/x86/kernel/traps.c:272
do_invalid_op+0x32/0x40 arch/x86/kernel/traps.c:291
invalid_op+0x14/0x20 arch/x86/entry/entry_64.S:986
RIP: 0010:gpio_to_desc drivers/gpio/gpiolib.c:124 [inline]
RIP: 0010:gpio_to_desc+0x152/0x1f0 drivers/gpio/gpiolib.c:106
Code: 00 00 77 13 e8 cf e0 57 ff 4c 89 e8 5b 5d 41 5c 41 5d 41 5e 41 5f c3
e8 bc e0 57 ff 89 ee 48 c7 c7 80 24 db 85 e8 59 a5 2d ff <0f> 0b eb d6 e8
a5 e0 57 ff 48 c7 c7 80 d6 08 87 4c 89 f6 e8 f6 23
RSP: 0018:ffff8881d9eff138 EFLAGS: 00010286
RAX: 0000000000000000 RBX: ffff8881d1605180 RCX: 0000000000000000
RDX: 0000000000000000 RSI: ffffffff8127ef3d RDI: ffffed103b3dfe19
RBP: 00000000ffffffea R08: ffff8881d9e36000 R09: ffffed103b663ed7
R10: ffffed103b663ed6 R11: ffff8881db31f6b7 R12: ffff8881d1605180
R13: 0000000000000000 R14: 0000000000000293 R15: 0000000000000000
__gpio_set_value include/asm-generic/gpio.h:104 [inline]
gpio_set_value include/linux/gpio.h:71 [inline]
nfcmrvl_chip_halt+0x4e/0x70 drivers/nfc/nfcmrvl/main.c:259
nfcmrvl_nci_register_dev+0x2d4/0x378 drivers/nfc/nfcmrvl/main.c:176
nfcmrvl_probe+0x4e9/0x5e0 drivers/nfc/nfcmrvl/usb.c:344
usb_probe_interface+0x305/0x7a0 drivers/usb/core/driver.c:361
really_probe+0x281/0x660 drivers/base/dd.c:509
driver_probe_device+0x104/0x210 drivers/base/dd.c:670
__device_attach_driver+0x1c2/0x220 drivers/base/dd.c:777
bus_for_each_drv+0x15c/0x1e0 drivers/base/bus.c:454
__device_attach+0x217/0x360 drivers/base/dd.c:843
bus_probe_device+0x1e4/0x290 drivers/base/bus.c:514
device_add+0xae6/0x16f0 drivers/base/core.c:2111
usb_set_configuration+0xdf6/0x1670 drivers/usb/core/message.c:2023
generic_probe+0x9d/0xd5 drivers/usb/core/generic.c:210
usb_probe_device+0x99/0x100 drivers/usb/core/driver.c:266
really_probe+0x281/0x660 drivers/base/dd.c:509
driver_probe_device+0x104/0x210 drivers/base/dd.c:670
__device_attach_driver+0x1c2/0x220 drivers/base/dd.c:777
bus_for_each_drv+0x15c/0x1e0 drivers/base/bus.c:454
__device_attach+0x217/0x360 drivers/base/dd.c:843
bus_probe_device+0x1e4/0x290 drivers/base/bus.c:514
device_add+0xae6/0x16f0 drivers/base/core.c:2111
usb_new_device.cold+0x8c1/0x1016 drivers/usb/core/hub.c:2534
hub_port_connect drivers/usb/core/hub.c:5089 [inline]
hub_port_connect_change drivers/usb/core/hub.c:5204 [inline]
port_event drivers/usb/core/hub.c:5350 [inline]
hub_event+0x1ada/0x3590 drivers/usb/core/hub.c:5432
process_one_work+0x905/0x1570 kernel/workqueue.c:2269
worker_thread+0x96/0xe20 kernel/workqueue.c:2415
kthread+0x30b/0x410 kernel/kthread.c:255
ret_from_fork+0x24/0x30 arch/x86/entry/entry_64.S:352
Kernel Offset: disabled
Rebooting in 86400 seconds..
---
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.
syzbot can test patches for this bug, for details see:
https://goo.gl/tpsmEJ#testing-patches
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: WARNING in gpio_to_desc
2019-07-10 11:07 WARNING in gpio_to_desc syzbot
@ 2019-07-16 21:52 ` Linus Walleij
2019-07-17 9:16 ` Johan Hovold
0 siblings, 1 reply; 6+ messages in thread
From: Linus Walleij @ 2019-07-16 21:52 UTC (permalink / raw)
To: syzbot, Johan Hovold, Vincent Cuissard
Cc: Andrey Konovalov, Bartosz Golaszewski, open list:GPIO SUBSYSTEM,
linux-kernel, linux-usb, syzkaller-bugs
On Wed, Jul 10, 2019 at 1:07 PM syzbot
<syzbot+cf35b76f35e068a1107f@syzkaller.appspotmail.com> wrote:
> HEAD commit: 7829a896 usb-fuzzer: main usb gadget fuzzer driver
(...)
> __gpio_set_value include/asm-generic/gpio.h:104 [inline]
> gpio_set_value include/linux/gpio.h:71 [inline]
> nfcmrvl_chip_halt+0x4e/0x70 drivers/nfc/nfcmrvl/main.c:259
> nfcmrvl_nci_register_dev+0x2d4/0x378 drivers/nfc/nfcmrvl/main.c:176
> nfcmrvl_probe+0x4e9/0x5e0 drivers/nfc/nfcmrvl/usb.c:344
This bug is somewhere in the drivers/nfc/nfcmrvl* code handling
GPIOs.
It should be converted to GPIO descriptors and fixed up, see
drivers/gpio/TODO for details on how to do this.
Johan/Vincent, tell me if you want me to forward the full fuzzing
robot crash dump.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: WARNING in gpio_to_desc
2019-07-16 21:52 ` Linus Walleij
@ 2019-07-17 9:16 ` Johan Hovold
2019-07-17 9:23 ` Dmitry Vyukov
2019-07-17 11:48 ` Andrey Konovalov
0 siblings, 2 replies; 6+ messages in thread
From: Johan Hovold @ 2019-07-17 9:16 UTC (permalink / raw)
To: Linus Walleij
Cc: syzbot, Johan Hovold, Vincent Cuissard, Andrey Konovalov,
Bartosz Golaszewski, open list:GPIO SUBSYSTEM, linux-kernel,
linux-usb, syzkaller-bugs, Samuel Ortiz
On Tue, Jul 16, 2019 at 11:52:19PM +0200, Linus Walleij wrote:
> On Wed, Jul 10, 2019 at 1:07 PM syzbot
> <syzbot+cf35b76f35e068a1107f@syzkaller.appspotmail.com> wrote:
>
> > HEAD commit: 7829a896 usb-fuzzer: main usb gadget fuzzer driver
> (...)
> > __gpio_set_value include/asm-generic/gpio.h:104 [inline]
> > gpio_set_value include/linux/gpio.h:71 [inline]
> > nfcmrvl_chip_halt+0x4e/0x70 drivers/nfc/nfcmrvl/main.c:259
> > nfcmrvl_nci_register_dev+0x2d4/0x378 drivers/nfc/nfcmrvl/main.c:176
> > nfcmrvl_probe+0x4e9/0x5e0 drivers/nfc/nfcmrvl/usb.c:344
>
> This bug is somewhere in the drivers/nfc/nfcmrvl* code handling
> GPIOs.
Right, and it's my bug.
> It should be converted to GPIO descriptors and fixed up, see
> drivers/gpio/TODO for details on how to do this.
Conversion will have to wait, let's fix the regression first. :)
> Johan/Vincent, tell me if you want me to forward the full fuzzing
> robot crash dump.
No need, thanks. I got it the report.
Something like the below compiles and should fix it. Vacation starts
today so I'll revisit and send a proper patch in a couple of weeks.
Perhaps someone can feed it to the bot meanwhile (no time to play with
it right now).
Note that this issue has been there since 4.12, so guess no one uses
these devices...
Johan
From e9d9d0ef5ffd6b306cffb2f4e2514f503aa626a5 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan@kernel.org>
Date: Wed, 17 Jul 2019 11:07:13 +0200
Subject: [PATCH] NFC: nfcmrvl: fix gpio-handling regression
FIXME
Fixes: e33a3f84f88f ("NFC: nfcmrvl: allow gpio 0 for reset signalling")
Not-Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/nfc/nfcmrvl/main.c | 4 ++--
drivers/nfc/nfcmrvl/usb.c | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index e65d027b91fa..529be35ac178 100644
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -244,7 +244,7 @@ void nfcmrvl_chip_reset(struct nfcmrvl_private *priv)
/* Reset possible fault of previous session */
clear_bit(NFCMRVL_PHY_ERROR, &priv->flags);
- if (priv->config.reset_n_io) {
+ if (gpio_is_valid(priv->config.reset_n_io)) {
nfc_info(priv->dev, "reset the chip\n");
gpio_set_value(priv->config.reset_n_io, 0);
usleep_range(5000, 10000);
@@ -255,7 +255,7 @@ void nfcmrvl_chip_reset(struct nfcmrvl_private *priv)
void nfcmrvl_chip_halt(struct nfcmrvl_private *priv)
{
- if (priv->config.reset_n_io)
+ if (gpio_is_valid(priv->config.reset_n_io))
gpio_set_value(priv->config.reset_n_io, 0);
}
diff --git a/drivers/nfc/nfcmrvl/usb.c b/drivers/nfc/nfcmrvl/usb.c
index 945cc903d8f1..888e298f610b 100644
--- a/drivers/nfc/nfcmrvl/usb.c
+++ b/drivers/nfc/nfcmrvl/usb.c
@@ -305,6 +305,7 @@ static int nfcmrvl_probe(struct usb_interface *intf,
/* No configuration for USB */
memset(&config, 0, sizeof(config));
+ config.reset_n_io = -EINVAL;
nfc_info(&udev->dev, "intf %p id %p\n", intf, id);
--
2.22.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: WARNING in gpio_to_desc
2019-07-17 9:16 ` Johan Hovold
@ 2019-07-17 9:23 ` Dmitry Vyukov
2019-07-17 11:48 ` Andrey Konovalov
1 sibling, 0 replies; 6+ messages in thread
From: Dmitry Vyukov @ 2019-07-17 9:23 UTC (permalink / raw)
To: Johan Hovold
Cc: Linus Walleij, syzbot, Vincent Cuissard, Andrey Konovalov,
Bartosz Golaszewski, open list:GPIO SUBSYSTEM, linux-kernel,
linux-usb, syzkaller-bugs, Samuel Ortiz
On Wed, Jul 17, 2019 at 11:16 AM Johan Hovold <johan@kernel.org> wrote:
>
> On Tue, Jul 16, 2019 at 11:52:19PM +0200, Linus Walleij wrote:
> > On Wed, Jul 10, 2019 at 1:07 PM syzbot
> > <syzbot+cf35b76f35e068a1107f@syzkaller.appspotmail.com> wrote:
> >
> > > HEAD commit: 7829a896 usb-fuzzer: main usb gadget fuzzer driver
> > (...)
> > > __gpio_set_value include/asm-generic/gpio.h:104 [inline]
> > > gpio_set_value include/linux/gpio.h:71 [inline]
> > > nfcmrvl_chip_halt+0x4e/0x70 drivers/nfc/nfcmrvl/main.c:259
> > > nfcmrvl_nci_register_dev+0x2d4/0x378 drivers/nfc/nfcmrvl/main.c:176
> > > nfcmrvl_probe+0x4e9/0x5e0 drivers/nfc/nfcmrvl/usb.c:344
> >
> > This bug is somewhere in the drivers/nfc/nfcmrvl* code handling
> > GPIOs.
>
> Right, and it's my bug.
>
> > It should be converted to GPIO descriptors and fixed up, see
> > drivers/gpio/TODO for details on how to do this.
>
> Conversion will have to wait, let's fix the regression first. :)
>
> > Johan/Vincent, tell me if you want me to forward the full fuzzing
> > robot crash dump.
>
> No need, thanks. I got it the report.
>
> Something like the below compiles and should fix it. Vacation starts
> today so I'll revisit and send a proper patch in a couple of weeks.
>
> Perhaps someone can feed it to the bot meanwhile (no time to play with
> it right now).
>
> Note that this issue has been there since 4.12, so guess no one uses
> these devices...
>
> Johan
>
>
> From e9d9d0ef5ffd6b306cffb2f4e2514f503aa626a5 Mon Sep 17 00:00:00 2001
> From: Johan Hovold <johan@kernel.org>
> Date: Wed, 17 Jul 2019 11:07:13 +0200
> Subject: [PATCH] NFC: nfcmrvl: fix gpio-handling regression
>
> FIXME
>
> Fixes: e33a3f84f88f ("NFC: nfcmrvl: allow gpio 0 for reset signalling")
> Not-Signed-off-by: Johan Hovold <johan@kernel.org>
Please don't forget:
> IMPORTANT: if you fix the bug, please add the following tag to the commit:
> Reported-by: syzbot+cf35b76f35e068a1107f@syzkaller.appspotmail.com
> ---
> drivers/nfc/nfcmrvl/main.c | 4 ++--
> drivers/nfc/nfcmrvl/usb.c | 1 +
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
> index e65d027b91fa..529be35ac178 100644
> --- a/drivers/nfc/nfcmrvl/main.c
> +++ b/drivers/nfc/nfcmrvl/main.c
> @@ -244,7 +244,7 @@ void nfcmrvl_chip_reset(struct nfcmrvl_private *priv)
> /* Reset possible fault of previous session */
> clear_bit(NFCMRVL_PHY_ERROR, &priv->flags);
>
> - if (priv->config.reset_n_io) {
> + if (gpio_is_valid(priv->config.reset_n_io)) {
> nfc_info(priv->dev, "reset the chip\n");
> gpio_set_value(priv->config.reset_n_io, 0);
> usleep_range(5000, 10000);
> @@ -255,7 +255,7 @@ void nfcmrvl_chip_reset(struct nfcmrvl_private *priv)
>
> void nfcmrvl_chip_halt(struct nfcmrvl_private *priv)
> {
> - if (priv->config.reset_n_io)
> + if (gpio_is_valid(priv->config.reset_n_io))
> gpio_set_value(priv->config.reset_n_io, 0);
> }
>
> diff --git a/drivers/nfc/nfcmrvl/usb.c b/drivers/nfc/nfcmrvl/usb.c
> index 945cc903d8f1..888e298f610b 100644
> --- a/drivers/nfc/nfcmrvl/usb.c
> +++ b/drivers/nfc/nfcmrvl/usb.c
> @@ -305,6 +305,7 @@ static int nfcmrvl_probe(struct usb_interface *intf,
>
> /* No configuration for USB */
> memset(&config, 0, sizeof(config));
> + config.reset_n_io = -EINVAL;
>
> nfc_info(&udev->dev, "intf %p id %p\n", intf, id);
>
> --
> 2.22.0
>
> --
> You received this message because you are subscribed to the Google Groups "syzkaller-bugs" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to syzkaller-bugs+unsubscribe@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/syzkaller-bugs/20190717091621.GC16694%40localhost.
> For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: WARNING in gpio_to_desc
2019-07-17 9:16 ` Johan Hovold
2019-07-17 9:23 ` Dmitry Vyukov
@ 2019-07-17 11:48 ` Andrey Konovalov
2019-07-17 12:07 ` syzbot
1 sibling, 1 reply; 6+ messages in thread
From: Andrey Konovalov @ 2019-07-17 11:48 UTC (permalink / raw)
To: Johan Hovold
Cc: Linus Walleij, syzbot, Vincent Cuissard, Bartosz Golaszewski,
open list:GPIO SUBSYSTEM, linux-kernel, linux-usb,
syzkaller-bugs, Samuel Ortiz
[-- Attachment #1: Type: text/plain, Size: 3389 bytes --]
On Wed, Jul 17, 2019 at 11:16 AM Johan Hovold <johan@kernel.org> wrote:
>
> On Tue, Jul 16, 2019 at 11:52:19PM +0200, Linus Walleij wrote:
> > On Wed, Jul 10, 2019 at 1:07 PM syzbot
> > <syzbot+cf35b76f35e068a1107f@syzkaller.appspotmail.com> wrote:
> >
> > > HEAD commit: 7829a896 usb-fuzzer: main usb gadget fuzzer driver
> > (...)
> > > __gpio_set_value include/asm-generic/gpio.h:104 [inline]
> > > gpio_set_value include/linux/gpio.h:71 [inline]
> > > nfcmrvl_chip_halt+0x4e/0x70 drivers/nfc/nfcmrvl/main.c:259
> > > nfcmrvl_nci_register_dev+0x2d4/0x378 drivers/nfc/nfcmrvl/main.c:176
> > > nfcmrvl_probe+0x4e9/0x5e0 drivers/nfc/nfcmrvl/usb.c:344
> >
> > This bug is somewhere in the drivers/nfc/nfcmrvl* code handling
> > GPIOs.
>
> Right, and it's my bug.
>
> > It should be converted to GPIO descriptors and fixed up, see
> > drivers/gpio/TODO for details on how to do this.
>
> Conversion will have to wait, let's fix the regression first. :)
>
> > Johan/Vincent, tell me if you want me to forward the full fuzzing
> > robot crash dump.
>
> No need, thanks. I got it the report.
>
> Something like the below compiles and should fix it. Vacation starts
> today so I'll revisit and send a proper patch in a couple of weeks.
>
> Perhaps someone can feed it to the bot meanwhile (no time to play with
> it right now).
#syz test: https://github.com/google/kasan.git usb-fuzzer
>
> Note that this issue has been there since 4.12, so guess no one uses
> these devices...
>
> Johan
>
>
> From e9d9d0ef5ffd6b306cffb2f4e2514f503aa626a5 Mon Sep 17 00:00:00 2001
> From: Johan Hovold <johan@kernel.org>
> Date: Wed, 17 Jul 2019 11:07:13 +0200
> Subject: [PATCH] NFC: nfcmrvl: fix gpio-handling regression
>
> FIXME
>
> Fixes: e33a3f84f88f ("NFC: nfcmrvl: allow gpio 0 for reset signalling")
> Not-Signed-off-by: Johan Hovold <johan@kernel.org>
> ---
> drivers/nfc/nfcmrvl/main.c | 4 ++--
> drivers/nfc/nfcmrvl/usb.c | 1 +
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
> index e65d027b91fa..529be35ac178 100644
> --- a/drivers/nfc/nfcmrvl/main.c
> +++ b/drivers/nfc/nfcmrvl/main.c
> @@ -244,7 +244,7 @@ void nfcmrvl_chip_reset(struct nfcmrvl_private *priv)
> /* Reset possible fault of previous session */
> clear_bit(NFCMRVL_PHY_ERROR, &priv->flags);
>
> - if (priv->config.reset_n_io) {
> + if (gpio_is_valid(priv->config.reset_n_io)) {
> nfc_info(priv->dev, "reset the chip\n");
> gpio_set_value(priv->config.reset_n_io, 0);
> usleep_range(5000, 10000);
> @@ -255,7 +255,7 @@ void nfcmrvl_chip_reset(struct nfcmrvl_private *priv)
>
> void nfcmrvl_chip_halt(struct nfcmrvl_private *priv)
> {
> - if (priv->config.reset_n_io)
> + if (gpio_is_valid(priv->config.reset_n_io))
> gpio_set_value(priv->config.reset_n_io, 0);
> }
>
> diff --git a/drivers/nfc/nfcmrvl/usb.c b/drivers/nfc/nfcmrvl/usb.c
> index 945cc903d8f1..888e298f610b 100644
> --- a/drivers/nfc/nfcmrvl/usb.c
> +++ b/drivers/nfc/nfcmrvl/usb.c
> @@ -305,6 +305,7 @@ static int nfcmrvl_probe(struct usb_interface *intf,
>
> /* No configuration for USB */
> memset(&config, 0, sizeof(config));
> + config.reset_n_io = -EINVAL;
>
> nfc_info(&udev->dev, "intf %p id %p\n", intf, id);
>
> --
> 2.22.0
>
[-- Attachment #2: usb-gpio.patch --]
[-- Type: text/x-patch, Size: 1690 bytes --]
From e9d9d0ef5ffd6b306cffb2f4e2514f503aa626a5 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan@kernel.org>
Date: Wed, 17 Jul 2019 11:07:13 +0200
Subject: [PATCH] NFC: nfcmrvl: fix gpio-handling regression
FIXME
Fixes: e33a3f84f88f ("NFC: nfcmrvl: allow gpio 0 for reset signalling")
Not-Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/nfc/nfcmrvl/main.c | 4 ++--
drivers/nfc/nfcmrvl/usb.c | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index e65d027b91fa..529be35ac178 100644
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -244,7 +244,7 @@ void nfcmrvl_chip_reset(struct nfcmrvl_private *priv)
/* Reset possible fault of previous session */
clear_bit(NFCMRVL_PHY_ERROR, &priv->flags);
- if (priv->config.reset_n_io) {
+ if (gpio_is_valid(priv->config.reset_n_io)) {
nfc_info(priv->dev, "reset the chip\n");
gpio_set_value(priv->config.reset_n_io, 0);
usleep_range(5000, 10000);
@@ -255,7 +255,7 @@ void nfcmrvl_chip_reset(struct nfcmrvl_private *priv)
void nfcmrvl_chip_halt(struct nfcmrvl_private *priv)
{
- if (priv->config.reset_n_io)
+ if (gpio_is_valid(priv->config.reset_n_io))
gpio_set_value(priv->config.reset_n_io, 0);
}
diff --git a/drivers/nfc/nfcmrvl/usb.c b/drivers/nfc/nfcmrvl/usb.c
index 945cc903d8f1..888e298f610b 100644
--- a/drivers/nfc/nfcmrvl/usb.c
+++ b/drivers/nfc/nfcmrvl/usb.c
@@ -305,6 +305,7 @@ static int nfcmrvl_probe(struct usb_interface *intf,
/* No configuration for USB */
memset(&config, 0, sizeof(config));
+ config.reset_n_io = -EINVAL;
nfc_info(&udev->dev, "intf %p id %p\n", intf, id);
--
2.22.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: WARNING in gpio_to_desc
2019-07-17 11:48 ` Andrey Konovalov
@ 2019-07-17 12:07 ` syzbot
0 siblings, 0 replies; 6+ messages in thread
From: syzbot @ 2019-07-17 12:07 UTC (permalink / raw)
To: andreyknvl, bgolaszewski, cuissard, johan, linus.walleij,
linux-gpio, linux-kernel, linux-usb, sameo, syzkaller-bugs
Hello,
syzbot has tested the proposed patch and the reproducer did not trigger
crash:
Reported-and-tested-by:
syzbot+cf35b76f35e068a1107f@syzkaller.appspotmail.com
Tested on:
commit: 6a3599ce usb-fuzzer: main usb gadget fuzzer driver
git tree: https://github.com/google/kasan.git usb-fuzzer
kernel config: https://syzkaller.appspot.com/x/.config?x=d90745bdf884fc0a
compiler: gcc (GCC) 9.0.0 20181231 (experimental)
patch: https://syzkaller.appspot.com/x/patch.diff?x=126cd1a4600000
Note: testing is done by a robot and is best-effort only.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-07-17 12:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-10 11:07 WARNING in gpio_to_desc syzbot
2019-07-16 21:52 ` Linus Walleij
2019-07-17 9:16 ` Johan Hovold
2019-07-17 9:23 ` Dmitry Vyukov
2019-07-17 11:48 ` Andrey Konovalov
2019-07-17 12:07 ` syzbot
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).