| Message ID | f747595846809aa8626a2fc6b4bdcda5af75d42a.1521417707.git.sbrivio@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] ipv6: old_dport should be a __be16 in __ip6_datagram_connect() | expand |
On Mon, Mar 19, 2018 at 11:24:58AM +0100, Stefano Brivio wrote: > 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> > --- > net/ipv6/datagram.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c > index 8a9ac2d0f5d3..a9f7eca0b6a3 100644 > --- a/net/ipv6/datagram.c > +++ b/net/ipv6/datagram.c > @@ -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; > Acked-by: Guillaume Nault <g.nault@alphalink.fr>
From: Stefano Brivio <sbrivio@redhat.com> Date: Mon, 19 Mar 2018 11:24:58 +0100 > 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> Applied, thanks.
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index 8a9ac2d0f5d3..a9f7eca0b6a3 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -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;
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> --- net/ipv6/datagram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)