Explorar o código

Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux into for-linus2

James Morris %!s(int64=10) %!d(string=hai) anos
pai
achega
9b32011acd
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      security/selinux/hooks.c

+ 1 - 1
security/selinux/hooks.c

@@ -481,6 +481,7 @@ next_inode:
 				list_entry(sbsec->isec_head.next,
 				list_entry(sbsec->isec_head.next,
 					   struct inode_security_struct, list);
 					   struct inode_security_struct, list);
 		struct inode *inode = isec->inode;
 		struct inode *inode = isec->inode;
+		list_del_init(&isec->list);
 		spin_unlock(&sbsec->isec_lock);
 		spin_unlock(&sbsec->isec_lock);
 		inode = igrab(inode);
 		inode = igrab(inode);
 		if (inode) {
 		if (inode) {
@@ -489,7 +490,6 @@ next_inode:
 			iput(inode);
 			iput(inode);
 		}
 		}
 		spin_lock(&sbsec->isec_lock);
 		spin_lock(&sbsec->isec_lock);
-		list_del_init(&isec->list);
 		goto next_inode;
 		goto next_inode;
 	}
 	}
 	spin_unlock(&sbsec->isec_lock);
 	spin_unlock(&sbsec->isec_lock);