UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

kobject: fix dereference before null check on kobj 

The kobj pointer is being null-checked so potentially it could be null,
however, the ktype declaration before the null check is dereferencing kobj
hence we have a potential null pointer deference. Fix this by moving the
assignment of ktype after kobj has been null checked.

Addresses-Coverity: ("Dereference before null check")
Fixes: aa30f47cf6 ("kobject: Add support for default attribute groups to kobj_type")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Colin Ian King 2019-05-01 13:43:17 +01:00 committed by Greg Kroah-Hartman
parent 391c0325cc
commit 3d378dc713
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/kobject.c
View File

@ -603,12 +603,13 @@ EXPORT_SYMBOL_GPL(kobject_move);
void kobject_del(struct kobject *kobj) void kobject_del(struct kobject *kobj)
{ {
struct kernfs_node *sd; struct kernfs_node *sd;
const struct kobj_type *ktype = get_ktype(kobj); const struct kobj_type *ktype;
if (!kobj) if (!kobj)
return; return;
sd = kobj->sd; sd = kobj->sd;
ktype = get_ktype(kobj);
if (ktype) if (ktype)
sysfs_remove_groups(kobj, ktype->default_groups); sysfs_remove_groups(kobj, ktype->default_groups);