[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20190723135256.22475-1-oneukum@suse.com>
Date: Tue, 23 Jul 2019 15:52:56 +0200
From: Oliver Neukum <oneukum@...e.com>
To: davem@...emloft.net, netdev@...r.kernel.org
Cc: Oliver Neukum <oneukum@...e.com>
Subject: [PATCHv2] libertas: add terminating entry to fw_table
In case no firmware was found, the system would happily read
and try to load garbage. Terminate the table properly.
V2: change style issues
Fixes: ce84bb69f50e6 ("libertas USB: convert to asynchronous firmware loading")
Signed-off-by: Oliver Neukum <oneukum@...e.com>
Reported-by: syzbot+8a8f48672560c8ca59dd@...kaller.appspotmail.com
---
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 afac2481909b..fedafdc8b989 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[] = {
--
2.16.4
Powered by blists - more mailing lists