Commit e05dd564 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Greg Kroah-Hartman

driver core: Don't ignore class_dir_create_and_add() failure.

commit 84d0c27d upstream.

syzbot is hitting WARN() at kernfs_add_one() [1].
This is because kernfs_create_link() is confused by previous device_add()
call which continued without setting dev->kobj.parent field when
get_device_parent() failed by memory allocation fault injection.
Fix this by propagating the error from class_dir_create_and_add() to
the calllers of get_device_parent().

[1] https://syzkaller.appspot.com/bug?id=fae0fb607989ea744526d1c082a5b8de6529116fSigned-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Reported-by: default avatarsyzbot <syzbot+df47f81c226b31d89fb1@syzkaller.appspotmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f444af38
...@@ -759,7 +759,7 @@ class_dir_create_and_add(struct class *class, struct kobject *parent_kobj) ...@@ -759,7 +759,7 @@ class_dir_create_and_add(struct class *class, struct kobject *parent_kobj)
dir = kzalloc(sizeof(*dir), GFP_KERNEL); dir = kzalloc(sizeof(*dir), GFP_KERNEL);
if (!dir) if (!dir)
return NULL; return ERR_PTR(-ENOMEM);
dir->class = class; dir->class = class;
kobject_init(&dir->kobj, &class_dir_ktype); kobject_init(&dir->kobj, &class_dir_ktype);
...@@ -769,7 +769,7 @@ class_dir_create_and_add(struct class *class, struct kobject *parent_kobj) ...@@ -769,7 +769,7 @@ class_dir_create_and_add(struct class *class, struct kobject *parent_kobj)
retval = kobject_add(&dir->kobj, parent_kobj, "%s", class->name); retval = kobject_add(&dir->kobj, parent_kobj, "%s", class->name);
if (retval < 0) { if (retval < 0) {
kobject_put(&dir->kobj); kobject_put(&dir->kobj);
return NULL; return ERR_PTR(retval);
} }
return &dir->kobj; return &dir->kobj;
} }
...@@ -1076,6 +1076,10 @@ int device_add(struct device *dev) ...@@ -1076,6 +1076,10 @@ int device_add(struct device *dev)
parent = get_device(dev->parent); parent = get_device(dev->parent);
kobj = get_device_parent(dev, parent); kobj = get_device_parent(dev, parent);
if (IS_ERR(kobj)) {
error = PTR_ERR(kobj);
goto parent_error;
}
if (kobj) if (kobj)
dev->kobj.parent = kobj; dev->kobj.parent = kobj;
...@@ -1174,6 +1178,7 @@ int device_add(struct device *dev) ...@@ -1174,6 +1178,7 @@ int device_add(struct device *dev)
kobject_del(&dev->kobj); kobject_del(&dev->kobj);
Error: Error:
cleanup_glue_dir(dev, glue_dir); cleanup_glue_dir(dev, glue_dir);
parent_error:
put_device(parent); put_device(parent);
name_error: name_error:
kfree(dev->p); kfree(dev->p);
...@@ -1990,6 +1995,11 @@ int device_move(struct device *dev, struct device *new_parent, ...@@ -1990,6 +1995,11 @@ int device_move(struct device *dev, struct device *new_parent,
device_pm_lock(); device_pm_lock();
new_parent = get_device(new_parent); new_parent = get_device(new_parent);
new_parent_kobj = get_device_parent(dev, new_parent); new_parent_kobj = get_device_parent(dev, new_parent);
if (IS_ERR(new_parent_kobj)) {
error = PTR_ERR(new_parent_kobj);
put_device(new_parent);
goto out;
}
pr_debug("device: '%s': %s: moving to '%s'\n", dev_name(dev), pr_debug("device: '%s': %s: moving to '%s'\n", dev_name(dev),
__func__, new_parent ? dev_name(new_parent) : "<NULL>"); __func__, new_parent ? dev_name(new_parent) : "<NULL>");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment