[NET]: Ensure device name passed to SO_BINDTODEVICE is NULL terminated.

Found by Solar Designer. Signed-off-by: David S. Miller <davem@davemloft.net>
git-mirror · Mar 24, 2006 · f67ed26 · f67ed26
1 parent a1a8fee
commit f67ed26
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/net/core/sock.c b/net/core/sock.c
@@ -404,8 +404,9 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
 			if (!valbool) {
 				sk->sk_bound_dev_if = 0;
 			} else {
-				if (optlen > IFNAMSIZ) 
-					optlen = IFNAMSIZ; 
+				if (optlen > IFNAMSIZ - 1)
+					optlen = IFNAMSIZ - 1;
+				memset(devname, 0, sizeof(devname));
 				if (copy_from_user(devname, optval, optlen)) {
 					ret = -EFAULT;
 					break;