---

yaml --- r: 131675 b: refs/heads/master c: 09c50b4 h: refs/heads/master i: 131673: 6081b8f 131671: ccf90ee v: v3
git-mirror · Feb 22, 2009 · 67b4f2f · 67b4f2f
1 parent 694eb6d
commit 67b4f2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 586c25003707067f074043d80fb2071671c58db0
+refs/heads/master: 09c50b4a52c01a1f450b8eec819089e228655bfb
diff --git a/trunk/security/selinux/netlabel.c b/trunk/security/selinux/netlabel.c
@@ -490,8 +490,10 @@ int selinux_netlbl_socket_setsockopt(struct socket *sock,
 		lock_sock(sk);
 		rc = netlbl_sock_getattr(sk, &secattr);
 		release_sock(sk);
-		if (rc == 0 && secattr.flags != NETLBL_SECATTR_NONE)
+		if (rc == 0)
 			rc = -EACCES;
+		else if (rc == -ENOMSG)
+			rc = 0;
 		netlbl_secattr_destroy(&secattr);
 	}