2013-03-07 22:34:58

by Michał Pecio

Subject: [PATCH] orinoco_usb: don't release nonexistent firmware

From: Michal Pecio <[email protected]>

Initialize fw_entry to NULL to prevent cleanup code from passing
bogus pointer to release_firmware() when priv allocation fails.

Signed-off-by: Michal Pecio <[email protected]>
---

Applies against v3.8.2.

Issue found by a static checker. I don't own this hardware so the
patch hasn't been tested.

Should be valid, though.


drivers/net/wireless/orinoco/orinoco_usb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c
b/drivers/net/wireless/orinoco/orinoco_usb.c index 01624dc..2e998ac
100644 --- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
@@ -1578,7 +1578,7 @@ static int ezusb_probe(struct usb_interface
*interface, struct ezusb_priv *upriv = NULL;
struct usb_interface_descriptor *iface_desc;
struct usb_endpoint_descriptor *ep;
- const struct firmware *fw_entry;
+ const struct firmware *fw_entry = NULL;
int retval = 0;
int i;

--

2013-03-08 21:42:08

by Michał Pecio

Subject: Re: [PATCH] orinoco_usb: don't release nonexistent firmware

From: Michal Pecio <[email protected]>

Initialize fw_entry to NULL to prevent cleanup code from passing
bogus pointer to release_firmware() when priv allocation fails.

Signed-off-by: Michal Pecio <[email protected]>
---
drivers/net/wireless/orinoco/orinoco_usb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c
index 01624dc..2e998ac 100644
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
@@ -1578,7 +1578,7 @@ static int ezusb_probe(struct usb_interface *interface,
struct ezusb_priv *upriv = NULL;
struct usb_interface_descriptor *iface_desc;
struct usb_endpoint_descriptor *ep;
- const struct firmware *fw_entry;
+ const struct firmware *fw_entry = NULL;
int retval = 0;
int i;

--
1.8.1.5

2013-03-08 21:15:26

by John W. Linville

Subject: Re: [PATCH] orinoco_usb: don't release nonexistent firmware

This patch seems to have a lot of whitespace damage, etc. Please
revise it into something that applies with 'git am' and resubmit?

On Thu, Mar 07, 2013 at 11:33:41PM +0100, Michał Pecio wrote:
> From: Michal Pecio <[email protected]>
>
> Initialize fw_entry to NULL to prevent cleanup code from passing
> bogus pointer to release_firmware() when priv allocation fails.
>
> Signed-off-by: Michal Pecio <[email protected]>
> ---
>
> Applies against v3.8.2.
>
> Issue found by a static checker. I don't own this hardware so the
> patch hasn't been tested.
>
> Should be valid, though.
>
>
> drivers/net/wireless/orinoco/orinoco_usb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c
> b/drivers/net/wireless/orinoco/orinoco_usb.c index 01624dc..2e998ac
> 100644 --- a/drivers/net/wireless/orinoco/orinoco_usb.c
> +++ b/drivers/net/wireless/orinoco/orinoco_usb.c
> @@ -1578,7 +1578,7 @@ static int ezusb_probe(struct usb_interface
> *interface, struct ezusb_priv *upriv = NULL;
> struct usb_interface_descriptor *iface_desc;
> struct usb_endpoint_descriptor *ep;
> - const struct firmware *fw_entry;
> + const struct firmware *fw_entry = NULL;
> int retval = 0;
> int i;
>
> --
>

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.