From: David S. Miller <davem@davemloft.net>
Date: Fri, 24 Mar 2006 06:47:40 +0000 (-0800)
Subject: [NET]: Ensure device name passed to SO_BINDTODEVICE is NULL terminated.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f67ed26f2b3e92c0450deae3ffc3fff21c878a75;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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

Found by Solar Designer.

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

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