Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e315c121 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4ba51fd7 a02fe132

security/selinux/hooks.c

+2 −2
Original line number Diff line number Diff line
@@ -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;