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

Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 

Pull selinux fix from James Morris:
 "Fix for a list corruption bug in the SELinux code"

* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  selinux: fix inode security list corruption
parents 0e6e58f9 9b32011a

security/selinux/hooks.c

+1 −1
Original line number Diff line number Diff line
@@ -481,6 +481,7 @@ next_inode: 
				list_entry(sbsec->isec_head.next,

					   struct inode_security_struct, list);

		struct inode *inode = isec->inode;

		list_del_init(&isec->list);

		spin_unlock(&sbsec->isec_lock);

		inode = igrab(inode);

		if (inode) {
@@ -489,7 +490,6 @@ next_inode: 
			iput(inode);

		}

		spin_lock(&sbsec->isec_lock);

		list_del_init(&isec->list);

		goto next_inode;

	}

	spin_unlock(&sbsec->isec_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE