Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: selinux: prevent rentry into the FS
This commit is contained in:
Коммит
e315c121a8
|
@ -180,7 +180,7 @@ static int inode_alloc_security(struct inode *inode)
|
|||
struct task_security_struct *tsec = current->security;
|
||||
struct inode_security_struct *isec;
|
||||
|
||||
isec = kmem_cache_zalloc(sel_inode_cache, GFP_KERNEL);
|
||||
isec = kmem_cache_zalloc(sel_inode_cache, GFP_NOFS);
|
||||
if (!isec)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -2429,7 +2429,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir,
|
|||
return -EOPNOTSUPP;
|
||||
|
||||
if (name) {
|
||||
namep = kstrdup(XATTR_SELINUX_SUFFIX, GFP_KERNEL);
|
||||
namep = kstrdup(XATTR_SELINUX_SUFFIX, GFP_NOFS);
|
||||
if (!namep)
|
||||
return -ENOMEM;
|
||||
*name = namep;
|
||||
|
|
Загрузка…
Ссылка в новой задаче