2 files changed, 4 insertions, 2 deletions

diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 19ecc8de9e6b..d794abcc4b3b 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -215,7 +215,9 @@ static void devcgroup_css_free(struct cgroup *cgroup)
         struct dev_cgroup *dev_cgroup;
 
         dev_cgroup = cgroup_to_devcgroup(cgroup);
+        mutex_lock(&devcgroup_mutex);
         dev_exception_clean(dev_cgroup);
+        mutex_unlock(&devcgroup_mutex);
         kfree(dev_cgroup);
 }
 
diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c
index dfb26918699c..7dd538ef5b83 100644
--- a/security/integrity/evm/evm_crypto.c
+++ b/security/integrity/evm/evm_crypto.c
@@ -205,9 +205,9 @@ int evm_update_evmxattr(struct dentry *dentry, const char *xattr_name,
                 rc = __vfs_setxattr_noperm(dentry, XATTR_NAME_EVM,
                                            &xattr_data,
                                            sizeof(xattr_data), 0);
-        }
-        else if (rc == -ENODATA)
+        } else if (rc == -ENODATA && inode->i_op->removexattr) {
                 rc = inode->i_op->removexattr(dentry, XATTR_NAME_EVM);
+        }
         return rc;
 }