Re: [patch 2/2 -next v2] hid-lg4ff: add a kfree() to an error path

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, 19 Aug 2011, Dan Carpenter wrote:

> There is a small rare potential memory leak here.  Also Walter Harms
> points out that we can do a small cleanup as well by using kstrdup().
> 
> Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
> 
> diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c
> index dc38c2d..cbb0089 100644
> --- a/drivers/hid/hid-lg4ff.c
> +++ b/drivers/hid/hid-lg4ff.c
> @@ -435,12 +435,12 @@ int lg4ff_init(struct hid_device *hid)
>  		hid_err(hid, "Cannot add device, insufficient memory.\n");
>  		return -ENOMEM;
>  	}
> -	entry->device_id = (char *)kzalloc(strlen((&hid->dev)->kobj.name) + 1, GFP_KERNEL);
> +	entry->device_id = kstrdup((&hid->dev)->kobj.name, GFP_KERNEL);
>  	if (!entry->device_id) {
>  		hid_err(hid, "Cannot set device_id, insufficient memory.\n");
> +		kfree(entry);
>  		return -ENOMEM;
>  	}
> -	strcpy(entry->device_id, (&hid->dev)->kobj.name);
>  	entry->min_range = lg4ff_devices[i].min_range;
>  	entry->max_range = lg4ff_devices[i].max_range;
>  	entry->set_range = lg4ff_devices[i].set_range;
> 

Applied, thanks.

-- 
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Media Devel]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Linux Wireless Networking]     [Linux Omap]

  Powered by Linux