lkml.org 
[lkml]   [2022]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH net-next v3 03/10] udp/ipv6: prioritise the ip6 path over ip4 checks
From
Date
On Fri, 2022-05-13 at 16:26 +0100, Pavel Begunkov wrote:
> For AF_INET6 sockets we care the most about ipv6 but not ip4 mappings as
> it's requires some extra hops anyway. Take AF_INET6 case from the address
> parsing switch and add an explicit path for it. It removes some extra
> ifs from the path and removes the switch overhead.
>
> Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
> ---
> net/ipv6/udp.c | 37 +++++++++++++++++--------------------
> 1 file changed, 17 insertions(+), 20 deletions(-)
>
> diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
> index 85bff1252f5c..e0b1bea998ce 100644
> --- a/net/ipv6/udp.c
> +++ b/net/ipv6/udp.c
> @@ -1360,30 +1360,27 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
>
> /* destination address check */
> if (sin6) {
> - if (addr_len < offsetof(struct sockaddr, sa_data))
> - return -EINVAL;
> + if (addr_len < SIN6_LEN_RFC2133 || sin6->sin6_family != AF_INET6) {
> + if (addr_len < offsetof(struct sockaddr, sa_data))
> + return -EINVAL;

I think you can't access 'sin6->sin6_family' before validating the
socket address len, that is before doing:

if (addr_len < offsetof(struct sockaddr, sa_data))

Paolo

\
 
 \ /
  Last update: 2022-05-16 15:15    [W:0.457 / U:0.032 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site