diff --git a/[refs] b/[refs]
index 394e733b332d..77f319dbbb93 100644
--- 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
index f58701a7b728..3f4b26647386 100644
--- 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);
 	}