On Tue, Aug 21, 2007 at 05:46:40PM +0200, Johannes Berg wrote:
> On Sun, 2007-08-19 at 01:48 +0200, Michael Buesch wrote:
>
> > @@ -1598,8 +1601,29 @@ static int do_request_fw(struct b43_wlde
> > b43err(dev->wl, "Firmware file \"%s\" not found "
> > "or load failed.\n", path);
>
> + return err;
>
> > }
> > + if ((*fw)->size < sizeof(struct b43_fw_header))
> > + goto err_format;
>
> otherwise it oopses when the file can't be loaded.
ACK...here is a patch, in case you are lazy... :-)
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index dcf7edc..d8693cf 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1600,6 +1600,7 @@ static int do_request_fw(struct b43_wldev *dev,
if (err) {
b43err(dev->wl, "Firmware file \"%s\" not found "
"or load failed.\n", path);
+ return err;
}
if ((*fw)->size < sizeof(struct b43_fw_header))
goto err_format;
--
John W. Linville
linville@xxxxxxxxxxxxx
-
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
