4 files changed, 10 insertions, 5 deletions

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index feeae8081c22..aa85f2874a9f 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -43,7 +43,8 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
         kuid_t uid;
         kgid_t gid;
 
-        BUG_ON(!kobj);
+        if (WARN_ON(!kobj))
+                return -EINVAL;
 
         if (kobj->parent)
                 parent = kobj->parent->sd;
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index bb71db63c99c..51398457fe00 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -325,7 +325,8 @@ int sysfs_create_file_ns(struct kobject *kobj, const struct attribute *attr,
         kuid_t uid;
         kgid_t gid;
 
-        BUG_ON(!kobj || !kobj->sd || !attr);
+        if (WARN_ON(!kobj || !kobj->sd || !attr))
+                return -EINVAL;
 
         kobject_get_ownership(kobj, &uid, &gid);
         return sysfs_add_file_mode_ns(kobj->sd, attr, false, attr->mode,
@@ -537,7 +538,8 @@ int sysfs_create_bin_file(struct kobject *kobj,
         kuid_t uid;
         kgid_t gid;
 
-        BUG_ON(!kobj || !kobj->sd || !attr);
+        if (WARN_ON(!kobj || !kobj->sd || !attr))
+                return -EINVAL;
 
         kobject_get_ownership(kobj, &uid, &gid);
         return sysfs_add_file_mode_ns(kobj->sd, &attr->attr, true,
diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index 1eb2d6307663..57038604d4a8 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -112,7 +112,8 @@ static int internal_create_group(struct kobject *kobj, int update,
         kgid_t gid;
         int error;
 
-        BUG_ON(!kobj || (!update && !kobj->sd));
+        if (WARN_ON(!kobj || (!update && !kobj->sd)))
+                return -EINVAL;
 
         /* Updates may happen before the object has been instantiated */
         if (unlikely(update && !kobj->sd))
diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
index 215c225b2ca1..c4deecc80f67 100644
--- a/fs/sysfs/symlink.c
+++ b/fs/sysfs/symlink.c
@@ -23,7 +23,8 @@ static int sysfs_do_create_link_sd(struct kernfs_node *parent,
 {
         struct kernfs_node *kn, *target = NULL;
 
-        BUG_ON(!name || !parent);
+        if (WARN_ON(!name || !parent))
+                return -EINVAL;
 
         /*
          * We don't own @target_kobj and it may be removed at any time.