| Message ID | 20190711142744.31956-1-oneukum@suse.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | libertas: add terminating entry to fw_table | expand |
Hello! On 07/11/2019 05:27 PM, Oliver Neukum wrote: > In case no firmware was found, the system would happily read > and try to load garbage. Terminate the table properly. > > Signed-off-by: Oliver Neukum <oneukum@suse.com> > Fixes: ce84bb69f50e6 ("libertas USB: convert to asynchronous firmware loading") The Fixed: tag should precede the sign-offs, according to DaveM... > Reported-by: syzbot+8a8f48672560c8ca59dd@syzkaller.appspotmail.com That should be the 1st tag, I think... > --- > drivers/net/wireless/marvell/libertas/if_usb.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/marvell/libertas/if_usb.c b/drivers/net/wireless/marvell/libertas/if_usb.c > index f1622f0ff8c9..b79c65547f4c 100644 > --- a/drivers/net/wireless/marvell/libertas/if_usb.c > +++ b/drivers/net/wireless/marvell/libertas/if_usb.c > @@ -50,7 +50,10 @@ static const struct lbs_fw_table fw_table[] = { > { MODEL_8388, "libertas/usb8388_v5.bin", NULL }, > { MODEL_8388, "libertas/usb8388.bin", NULL }, > { MODEL_8388, "usb8388.bin", NULL }, > - { MODEL_8682, "libertas/usb8682.bin", NULL } > + { MODEL_8682, "libertas/usb8682.bin", NULL }, > + > + /*terminating entry - keep at end */ Why no space after /* ? > + { MODEL_8388, NULL, NULL } > }; > > static const struct usb_device_id if_usb_table[] = { MBR, Sergei
diff --git a/drivers/net/wireless/marvell/libertas/if_usb.c b/drivers/net/wireless/marvell/libertas/if_usb.c index f1622f0ff8c9..b79c65547f4c 100644 --- a/drivers/net/wireless/marvell/libertas/if_usb.c +++ b/drivers/net/wireless/marvell/libertas/if_usb.c @@ -50,7 +50,10 @@ static const struct lbs_fw_table fw_table[] = { { MODEL_8388, "libertas/usb8388_v5.bin", NULL }, { MODEL_8388, "libertas/usb8388.bin", NULL }, { MODEL_8388, "usb8388.bin", NULL }, - { MODEL_8682, "libertas/usb8682.bin", NULL } + { MODEL_8682, "libertas/usb8682.bin", NULL }, + + /*terminating entry - keep at end */ + { MODEL_8388, NULL, NULL } }; static const struct usb_device_id if_usb_table[] = {
In case no firmware was found, the system would happily read and try to load garbage. Terminate the table properly. Signed-off-by: Oliver Neukum <oneukum@suse.com> Fixes: ce84bb69f50e6 ("libertas USB: convert to asynchronous firmware loading") Reported-by: syzbot+8a8f48672560c8ca59dd@syzkaller.appspotmail.com --- drivers/net/wireless/marvell/libertas/if_usb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)