[ldv-project] [PATCH] p54usb: fix leaks at failure path in p54u_probe()

Alexey Khoroshilov khoroshilov at ispras.ru
Sun Mar 9 03:01:19 MSK 2014


On 09.03.2014 02:44, Krishna Chaitanya wrote:
> On Sat, Mar 8, 2014 at 2:41 AM, Alexey Khoroshilov
> <khoroshilov at ispras.ru> wrote:
>> If p54u_load_firmware() fails, p54u_probe() does not deallocate
>> already allocated resources. The patch adds proper failure handling.
>>
>> Found by Linux Driver Verification project (linuxtesting.org).
>>
>> Signed-off-by: Alexey Khoroshilov <khoroshilov at ispras.ru>
>> ---
>>  drivers/net/wireless/p54/p54usb.c | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
>> index 6e635cfa24c8..5df74503fd4f 100644
>> --- a/drivers/net/wireless/p54/p54usb.c
>> +++ b/drivers/net/wireless/p54/p54usb.c
>> @@ -1053,6 +1053,10 @@ static int p54u_probe(struct usb_interface *intf,
>>                 priv->upload_fw = p54u_upload_firmware_net2280;
>>         }
>>         err = p54u_load_firmware(dev, intf);
>> +       if (err) {
>> +               usb_put_dev(udev);
>> +               p54_free_common(dev);
>> +       }
>>         return err;
>>  }
> The load_firmware puts down the reference
> in case of error. Only free is required here.
No, p54u_load_firmware() puts down reference that was got up by itself.
So we still have to put down reference got up in p54u_probe().

--
Alexey





More information about the ldv-project mailing list