diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-22 10:10:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-22 10:10:10 -0800 |
| commit | a7ed6c4320a638971c81a7c273458eee3db5025b (patch) | |
| tree | b7e6a2000f62ca423befdfd41ff2d8188c50ad8a | |
| parent | 9067ac85d533651b98c2ff903182a20cbb361fcb (diff) | |
| parent | 103a197c0c4ec936f5a243b5b092e4e49213f569 (diff) | |
| download | linux-3.10-a7ed6c4320a638971c81a7c273458eee3db5025b.tar.gz linux-3.10-a7ed6c4320a638971c81a7c273458eee3db5025b.tar.bz2 linux-3.10-a7ed6c4320a638971c81a7c273458eee3db5025b.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem bugfixes from James Morris.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
security/device_cgroup: lock assert fails in dev_exception_clean()
evm: checking if removexattr is not a NULL
| -rw-r--r-- | security/device_cgroup.c | 2 | ||||
| -rw-r--r-- | security/integrity/evm/evm_crypto.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c index 19ecc8de9e6..d794abcc4b3 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 dfb26918699..7dd538ef5b8 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; } |