Commit 0b7f41f6 authored by Arjun Roy's avatar Arjun Roy Committed by David S. Miller

tcp-zerocopy: Update returned getsockopt() optlen.

TCP receive zerocopy currently does not update the returned optlen for
getsockopt() if the user passed in a larger than expected value.
Thus, userspace cannot properly determine if all the fields are set in
the passed-in struct. This patch sets the optlen for this case before
returning, in keeping with the expected operation of getsockopt().

Fixes: c8856c05 ("tcp-zerocopy: Return inq along with tcp receive zerocopy.")
Signed-off-by: default avatarArjun Roy <arjunroy@google.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ebb4a4bf
...@@ -3669,8 +3669,11 @@ static int do_tcp_getsockopt(struct sock *sk, int level, ...@@ -3669,8 +3669,11 @@ static int do_tcp_getsockopt(struct sock *sk, int level,
return -EFAULT; return -EFAULT;
if (len < offsetofend(struct tcp_zerocopy_receive, length)) if (len < offsetofend(struct tcp_zerocopy_receive, length))
return -EINVAL; return -EINVAL;
if (len > sizeof(zc)) if (len > sizeof(zc)) {
len = sizeof(zc); len = sizeof(zc);
if (put_user(len, optlen))
return -EFAULT;
}
if (copy_from_user(&zc, optval, len)) if (copy_from_user(&zc, optval, len))
return -EFAULT; return -EFAULT;
lock_sock(sk); lock_sock(sk);
......
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