commit f67ed26f2b3e92c0450deae3ffc3fff21c878a75
author David S. Miller <davem@davemloft.net> Thu Mar 23 22:47:40 2006 -0800
committer David S. Miller <davem@sunset.davemloft.net> Fri Mar 24 15:44:59 2006 -0800
tree c4dcdb47cfb5f3ba498698cd13421d204047b219
parent a1a8feed1743ec8d2af1dafa7c5321679f0a3e4f

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

Found by Solar Designer.

Signed-off-by: David S. Miller <davem@davemloft.net>

net/core/sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index 1a7e6ea..e110b90 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -404,8 +404,9 @@
 			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;