public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [patch] kobject: free memory if netlink_kernel_create() fails
@ 2010-05-25  9:51 Dan Carpenter
  2010-05-25 10:25 ` Eric W. Biederman
  0 siblings, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2010-05-25  9:51 UTC (permalink / raw)
  To: Eric W. Biederman
  Cc: Greg Kroah-Hartman, David S. Miller, linux-kernel,
	kernel-janitors

There is a kfree(ue_sk) missing on the error path if 
netlink_kernel_create() fails.

Signed-off-by: Dan Carpenter <error27@gmail.com>

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 59c1551..08e15f7 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -378,6 +378,7 @@ static int uevent_net_init(struct net *net)
 	if (!ue_sk->sk) {
 		printk(KERN_ERR
 		       "kobject_uevent: unable to create netlink socket!\n");
+		kfree(ue_sk);
 		return -ENODEV;
 	}
 	mutex_lock(&uevent_sock_mutex);

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [patch] kobject: free memory if netlink_kernel_create() fails
  2010-05-25  9:51 [patch] kobject: free memory if netlink_kernel_create() fails Dan Carpenter
@ 2010-05-25 10:25 ` Eric W. Biederman
  2010-05-26  7:43   ` David Miller
  0 siblings, 1 reply; 4+ messages in thread
From: Eric W. Biederman @ 2010-05-25 10:25 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Greg Kroah-Hartman, David S. Miller, linux-kernel,
	kernel-janitors

Dan Carpenter <error27@gmail.com> writes:

> There is a kfree(ue_sk) missing on the error path if 
> netlink_kernel_create() fails.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com>

Oops.

> diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
> index 59c1551..08e15f7 100644
> --- a/lib/kobject_uevent.c
> +++ b/lib/kobject_uevent.c
> @@ -378,6 +378,7 @@ static int uevent_net_init(struct net *net)
>  	if (!ue_sk->sk) {
>  		printk(KERN_ERR
>  		       "kobject_uevent: unable to create netlink socket!\n");
> +		kfree(ue_sk);
>  		return -ENODEV;
>  	}
>  	mutex_lock(&uevent_sock_mutex);

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [patch] kobject: free memory if netlink_kernel_create() fails
  2010-05-25 10:25 ` Eric W. Biederman
@ 2010-05-26  7:43   ` David Miller
  2010-05-26 14:35     ` Greg KH
  0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2010-05-26  7:43 UTC (permalink / raw)
  To: ebiederm; +Cc: error27, gregkh, linux-kernel, kernel-janitors

From: ebiederm@xmission.com (Eric W. Biederman)
Date: Tue, 25 May 2010 03:25:37 -0700

> Dan Carpenter <error27@gmail.com> writes:
> 
>> There is a kfree(ue_sk) missing on the error path if 
>> netlink_kernel_create() fails.
>>
>> Signed-off-by: Dan Carpenter <error27@gmail.com>
> Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com>

Greg, I assume you've got this one?

Thanks!

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [patch] kobject: free memory if netlink_kernel_create() fails
  2010-05-26  7:43   ` David Miller
@ 2010-05-26 14:35     ` Greg KH
  0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2010-05-26 14:35 UTC (permalink / raw)
  To: David Miller; +Cc: ebiederm, error27, linux-kernel, kernel-janitors

On Wed, May 26, 2010 at 12:43:47AM -0700, David Miller wrote:
> From: ebiederm@xmission.com (Eric W. Biederman)
> Date: Tue, 25 May 2010 03:25:37 -0700
> 
> > Dan Carpenter <error27@gmail.com> writes:
> > 
> >> There is a kfree(ue_sk) missing on the error path if 
> >> netlink_kernel_create() fails.
> >>
> >> Signed-off-by: Dan Carpenter <error27@gmail.com>
> > Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com>
> 
> Greg, I assume you've got this one?

Yes, I'll queue it up in a day or so.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-05-26 14:53 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-25  9:51 [patch] kobject: free memory if netlink_kernel_create() fails Dan Carpenter
2010-05-25 10:25 ` Eric W. Biederman
2010-05-26  7:43   ` David Miller
2010-05-26 14:35     ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox