Fix getsockname (ipv4/ipv6)
Subsystems (2)
PATCH 1/1 Fix getsockname (ipv4/ipv6)
This change will return ENOSPC if the return address provided by the caller of getsockname
is not sufficiently large to hold the return value. This is consistent with the rest of the API. However, there are some implemenations that copy only as many bytes of sockaddr from the kernel to user-space as specified in the *addrlen attribute. (1) This wasn't the behavior now
(2) we should not adopt this behavior because it is quite messy, e.g., copy only part of a port, IP-address? Most partial retrivals do not make sense. This is why I suggest returning EINVAL, when the return struct is too small.
--- net/ipv4/af_inet.c | 7 +++++-- net/ipv6/af_inet6.c | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-)
net/ipv4/af_inet.c +5 -2
@@ -677,10 +677,13 @@ do_err:int inet_getname (struct socket *sock,struct sockaddr *uaddr,int *uaddr_len,int peer) { -struct sock *sk = sock->sk; -struct inet_sock *inet =inet_sk (sk); +struct sock *sk = sock->sk; +struct inet_sock *inet =inet_sk (sk);struct sockaddr_in *sin = (struct sockaddr_in *)uaddr; +if (*uaddr_len <sizeof (struct sockaddr_in )) +return -ENOSPC ; + sin->sin_family =AF_INET ;if (peer) { if (!inet->dport ||
net/ipv6/af_inet6.c +3 -0
@@ -401,6 +401,9 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr,struct inet_sock *inet =inet_sk (sk);struct ipv6_pinfo *np =inet6_sk (sk); +if (*uaddr_len <sizeof (struct sockaddr_in6 )) +return -ENOSPC ; + sin->sin6_family =AF_INET6 ; sin->sin6_flowinfo =0 ; sin->sin6_scope_id =0 ;
Signature · 1 line
1.5.4.5
Quoted 2 lines · John Reumann
This change will return ENOSPC if the return address provided by the caller of getsockname
is not sufficiently large to hold the return value.
Those interfaces allow applications to query how large the sockaddr storage needs to be by checking *addrlen after a successful call.
Quoted 3 lines
This is consistent with the rest of the
API. However, there are some implemenations that copy only as many bytes of sockaddr from the kernel to user-space as specified in the *addrlen attribute. (1) This wasn't the behavior now
It is, and it has been for ages.
David Miller
maintainerFrom: Florian Westphal <[email protected]>
Date: Mon, 26 Jan 2009 23:37:33 +0100
Quoted 6 lines
Quoted 2 lines · John Reumann
This change will return ENOSPC if the return address provided by the caller of getsockname
is not sufficiently large to hold the return value.Those interfaces allow applications to query how large the sockaddr storage needs to be by checking *addrlen after a successful call.
Right.
Em Fri, Jan 23, 2009 at 04:45:52PM -0500, John Reumann escreveu:
Quoted 17 lines
This change will return ENOSPC if the return address provided by the caller of getsockname
is not sufficiently large to hold the return value. This is consistent with the rest of the API. However, there are some implemenations that copy only as many bytes of sockaddr from the kernel to user-space as specified in the *addrlen attribute. (1) This wasn't the behavior now
(2) we should not adopt this behavior because it is quite messy, e.g., copy only part of a port, IP-address? Most partial retrivals do not make sense. This is why I suggest returning EINVAL, when the return struct is too small.--- net/ipv4/af_inet.c | 7 +++++-- net/ipv6/af_inet6.c | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-)net/ipv4/af_inet.c +0
-0
net/ipv4/af_inet.c do_err: · line 681
Quoted 7 lines
net/ipv4/af_inet.c +2
-2@@ -677,10 +677,13 @@ do_err:int inet_getname (struct socket *sock,struct sockaddr *uaddr,int *uaddr_len,int peer) { -struct sock *sk = sock->sk; -struct inet_sock *inet =inet_sk (sk); +struct sock *sk = sock->sk; +struct inet_sock *inet =inet_sk (sk);
Besides the other problem pointed out by Florian, why the gratuitous reformatting above?
Quoted 29 lines
net/ipv4/af_inet.c +3
-0struct sockaddr_in *sin = (struct sockaddr_in *)uaddr; +if (*uaddr_len <sizeof (struct sockaddr_in )) +return -ENOSPC ; + sin->sin_family =AF_INET ;if (peer) { if (!inet->dport ||net/ipv6/af_inet6.c +3
-0@@ -401,6 +401,9 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr,struct inet_sock *inet =inet_sk (sk);struct ipv6_pinfo *np =inet6_sk (sk); +if (*uaddr_len <sizeof (struct sockaddr_in6 )) +return -ENOSPC ; + sin->sin6_family =AF_INET6 ; sin->sin6_flowinfo =0 ; sin->sin6_scope_id =0 ;Signature · 6 lines
1.5.4.5 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html