diff --git a/[refs] b/[refs] index c4880a4b0079..c7e7ffb8e802 100644 --- 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 index 648a734e6044..eaf4d6951a4a 100644 --- 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;