Commit f67ed26f authored by David S. Miller's avatar David S. Miller Committed by David S. Miller

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

Found by Solar Designer.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a1a8feed
...@@ -404,8 +404,9 @@ int sock_setsockopt(struct socket *sock, int level, int optname, ...@@ -404,8 +404,9 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
if (!valbool) { if (!valbool) {
sk->sk_bound_dev_if = 0; sk->sk_bound_dev_if = 0;
} else { } else {
if (optlen > IFNAMSIZ) if (optlen > IFNAMSIZ - 1)
optlen = IFNAMSIZ; optlen = IFNAMSIZ - 1;
memset(devname, 0, sizeof(devname));
if (copy_from_user(devname, optval, optlen)) { if (copy_from_user(devname, optval, optlen)) {
ret = -EFAULT; ret = -EFAULT;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment