---

yaml --- r: 30398 b: refs/heads/master c: 70cb234 h: refs/heads/master v: v3
git-mirror · Jun 26, 2006 · 381c407 · 381c407
1 parent 75d6ae7
commit 381c407
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ac90216abc7d39e694533aec2805efeb06bf8ac
+refs/heads/master: 70cb23477019b8739d23ead223539c7e6dfc509c
diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c
@@ -426,7 +426,7 @@ static int dest_name_check(struct sockaddr_tipc *dest, struct msghdr *m)
 
         if (copy_from_user(&hdr, m->msg_iov[0].iov_base, sizeof(hdr)))
 		return -EFAULT;
-	if ((ntohs(hdr.tcm_type) & 0xC000) & (!capable(CAP_NET_ADMIN)))
+	if ((ntohs(hdr.tcm_type) & 0xC000) && (!capable(CAP_NET_ADMIN)))
 		return -EACCES;
 
 	return 0;