openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2013-01-22 10:10:10 -08:00
parent 9067ac85d5 103a197c0c
commit a7ed6c4320
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/device_cgroup.c
View File

@ -215,7 +215,9 @@ static void devcgroup_css_free(struct cgroup *cgroup)
struct dev_cgroup *dev_cgroup; struct dev_cgroup *dev_cgroup;
dev_cgroup = cgroup_to_devcgroup(cgroup); dev_cgroup = cgroup_to_devcgroup(cgroup);
mutex_lock(&devcgroup_mutex);
dev_exception_clean(dev_cgroup); dev_exception_clean(dev_cgroup);
mutex_unlock(&devcgroup_mutex);
kfree(dev_cgroup); kfree(dev_cgroup);
} }

4
security/integrity/evm/evm_crypto.c
View File

@ -205,9 +205,9 @@ int evm_update_evmxattr(struct dentry *dentry, const char *xattr_name,
rc = __vfs_setxattr_noperm(dentry, XATTR_NAME_EVM, rc = __vfs_setxattr_noperm(dentry, XATTR_NAME_EVM,
&xattr_data, &xattr_data,
sizeof(xattr_data), 0); sizeof(xattr_data), 0);
} } else if (rc == -ENODATA && inode->i_op->removexattr) {
else if (rc == -ENODATA)
rc = inode->i_op->removexattr(dentry, XATTR_NAME_EVM); rc = inode->i_op->removexattr(dentry, XATTR_NAME_EVM);
}
return rc; return rc;
} }