2 files changed, 12 insertions, 2 deletions

diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index d17c20fd74e6..4733eab34a23 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -495,7 +495,7 @@ void debugfs_remove(struct dentry *dentry)
         struct dentry *parent;
         int ret;
 
-        if (!dentry)
+        if (IS_ERR_OR_NULL(dentry))
                 return;
 
         parent = dentry->d_parent;
@@ -527,7 +527,7 @@ void debugfs_remove_recursive(struct dentry *dentry)
         struct dentry *child;
         struct dentry *parent;
 
-        if (!dentry)
+        if (IS_ERR_OR_NULL(dentry))
                 return;
 
         parent = dentry->d_parent;
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index a5cf784f9cc2..6b0bb00d4d2b 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -307,6 +307,7 @@ static int sysfs_dentry_revalidate(struct dentry *dentry, unsigned int flags)
 {
         struct sysfs_dirent *sd;
         int is_dir;
+        int type;
 
         if (flags & LOOKUP_RCU)
                 return -ECHILD;
@@ -326,6 +327,15 @@ static int sysfs_dentry_revalidate(struct dentry *dentry, unsigned int flags)
         if (strcmp(dentry->d_name.name, sd->s_name) != 0)
                 goto out_bad;
 
+        /* The sysfs dirent has been moved to a different namespace */
+        type = KOBJ_NS_TYPE_NONE;
+        if (sd->s_parent) {
+                type = sysfs_ns_type(sd->s_parent);
+                if (type != KOBJ_NS_TYPE_NONE &&
+                                sysfs_info(dentry->d_sb)->ns[type] != sd->s_ns)
+                        goto out_bad;
+        }
+
         mutex_unlock(&sysfs_mutex);
 out_valid:
         return 1;