[PATCH 17/20] SELinux: remove unused and shadowed addrlen variable

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: James Morris
Date: Monday, July 7, 2008 - 9:42 am

Remove unused and shadowed addrlen variable.  Picked up by sparse.

Signed-off-by: James Morris <jmorris@namei.org>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Acked-by: Paul Moore <paul.moore@hp.com>
---
 security/selinux/hooks.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index f530008..6e8d0e9 100644
--- a/security/selinux/hooks.c
+++ b/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;
 		}
 
-- 
1.5.5.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
SELinux patches for 2.6.26, James Morris, (Mon Jul 7, 9:42 am)
[PATCH 08/20] selinux: simplify ioctl checking, James Morris, (Mon Jul 7, 9:42 am)
[PATCH 10/20] SELinux: open code policy_rwlock, James Morris, (Mon Jul 7, 9:42 am)
[PATCH 11/20] SELinux: open code load_mutex, James Morris, (Mon Jul 7, 9:42 am)
[PATCH 12/20] SELinux: open code sidtab lock, James Morris, (Mon Jul 7, 9:42 am)
[PATCH 17/20] SELinux: remove unused and shadowed addrlen ..., James Morris, (Mon Jul 7, 9:42 am)
Re: SELinux patches for 2.6.26, Theodore Tso, (Mon Jul 7, 11:23 am)
Re: SELinux patches for 2.6.26, James Morris, (Mon Jul 7, 3:49 pm)