From f0b3dc37bf81a83e6ad55af0fed75a8db8ba3e61 Mon Sep 17 00:00:00 2001 From: James Morris Date: Thu, 12 Jun 2008 01:39:58 +1000 Subject: [PATCH] --- yaml --- r: 99214 b: refs/heads/master c: e399f98224a03d2e85fb45eacba367c47173f6f9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/selinux/hooks.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 349b25fa94cf..9230111ddfee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6cbe27061a69ab89d25dbe42d1a4f33a8425fe88 +refs/heads/master: e399f98224a03d2e85fb45eacba367c47173f6f9 diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c index f53000803a5d..6e8d0e91c0ca 100644 --- a/trunk/security/selinux/hooks.c +++ b/trunk/security/selinux/hooks.c @@ -3669,7 +3669,7 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in struct sockaddr_in6 *addr6 = NULL; unsigned short snum; struct sock *sk = sock->sk; - u32 sid, node_perm, addrlen; + u32 sid, node_perm; tsec = current->security; isec = SOCK_INODE(sock)->i_security; @@ -3677,12 +3677,10 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in if (family == PF_INET) { addr4 = (struct sockaddr_in *)address; snum = ntohs(addr4->sin_port); - addrlen = sizeof(addr4->sin_addr.s_addr); addrp = (char *)&addr4->sin_addr.s_addr; } else { addr6 = (struct sockaddr_in6 *)address; snum = ntohs(addr6->sin6_port); - addrlen = sizeof(addr6->sin6_addr.s6_addr); addrp = (char *)&addr6->sin6_addr.s6_addr; }