[PATCH] Driver core: Fix device_add_attrs() error code path

[PATCH] Driver core: Fix device_add_attrs() error code path

[Rafael J. Wysocki]

From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

If the addition of dev_attr_online fails, device_add_attrs() should
remove device attribute groups as well as type and class attribute
groups before returning an error code.  Make that happen.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 drivers/base/core.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: linux-pm/drivers/base/core.c
===================================================================
--- linux-pm.orig/drivers/base/core.c
+++ linux-pm/drivers/base/core.c
@@ -491,11 +491,13 @@ static int device_add_attrs(struct devic
 	if (device_supports_offline(dev) && !dev->offline_disabled) {
 		error = device_create_file(dev, &dev_attr_online);
 		if (error)
-			goto err_remove_type_groups;
+			goto err_remove_dev_groups;
 	}
 
 	return 0;
 
+ err_remove_dev_groups:
+ 	device_remove_groups(dev, dev->groups);
  err_remove_type_groups:
 	if (type)
 		device_remove_groups(dev, type->groups);

Re: [PATCH] Driver core: Fix device_add_attrs() error code path

[Toshi Kani]

On Thu, 2013-12-12 at 06:11 +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> If the addition of dev_attr_online fails, device_add_attrs() should
> remove device attribute groups as well as type and class attribute
> groups before returning an error code.  Make that happen.
> 
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Nice catch!

Acked-by: Toshi Kani <toshi.kani@hp.com>

-Toshi

Re: [PATCH] Driver core: Fix device_add_attrs() error code path

[Greg Kroah-Hartman]

On Thu, Dec 12, 2013 at 06:11:02AM +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> If the addition of dev_attr_online fails, device_add_attrs() should
> remove device attribute groups as well as type and class attribute
> groups before returning an error code.  Make that happen.
> 
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Does this need tob e in 3.13-final?  Or can it wait for 3.14-rc1?  The
odds that this file creation would ever fail is _really_ low, right?

thanks,

greg k-h

Re: [PATCH] Driver core: Fix device_add_attrs() error code path

[Rafael J. Wysocki]

On Thursday, December 12, 2013 03:13:33 PM Greg Kroah-Hartman wrote:
> On Thu, Dec 12, 2013 at 06:11:02AM +0100, Rafael J. Wysocki wrote:
> > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > 
> > If the addition of dev_attr_online fails, device_add_attrs() should
> > remove device attribute groups as well as type and class attribute
> > groups before returning an error code.  Make that happen.
> > 
> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> Does this need tob e in 3.13-final?  Or can it wait for 3.14-rc1?  The
> odds that this file creation would ever fail is _really_ low, right?

Yeah, it's more of a cleanup than a fix, so 3.14-rc1 should be fine.

Thanks,
Rafael