From: Allan Stephens <allan.stephens@windriver.com>
Date: Mon, 26 Jun 2006 06:41:47 +0000 (-0700)
Subject: [TIPC]: Fixed privilege checking typo in dest_name_check().
X-Git-Tag: v2.6.18-rc1~614^2~32
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=70cb23477019b8739d23ead223539c7e6dfc509c;p=karo-tx-linux.git

[TIPC]: Fixed privilege checking typo in dest_name_check().

This patch originated by Stephane Ouellette <ouellettes@videotron.ca>.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Per Liden <per.liden@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 648a734e6044..eaf4d6951a4a 100644
--- a/net/tipc/socket.c
+++ b/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;