ipv6: old_dport should be a __be16 in __ip6_datagram_connect()
authorStefano Brivio <sbrivio@redhat.com>
Mon, 19 Mar 2018 10:24:58 +0000 (11:24 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 Mar 2018 16:10:39 +0000 (18:10 +0200)
[ Upstream commit 5f2fb802eee1df0810b47ea251942fe3fd36589a ]

Fixes: 2f987a76a977 ("net: ipv6: keep sk status consistent after datagram connect failure")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Acked-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv6/datagram.c

index 29da4b6..287112d 100644 (file)
@@ -149,7 +149,7 @@ int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr,
        struct in6_addr         *daddr, old_daddr;
        __be32                  fl6_flowlabel = 0;
        __be32                  old_fl6_flowlabel;
-       __be32                  old_dport;
+       __be16                  old_dport;
        int                     addr_type;
        int                     err;