Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6afc5fc7 authored by Vadim Fedorenko's avatar Vadim Fedorenko Committed by Greg Kroah-Hartman
Browse files

net: ipv6: fix return value of ip6_skb_dst_mtu 



commit 40fc3054b45820c28ea3c65e2c86d041dc244a8a upstream.

Commit 628a5c56 ("[INET]: Add IP(V6)_PMTUDISC_RPOBE") introduced
ip6_skb_dst_mtu with return value of signed int which is inconsistent
with actually returned values. Also 2 users of this function actually
assign its value to unsigned int variable and only __xfrm6_output
assigns result of this function to signed variable but actually uses
as unsigned in further comparisons and calls. Change this function
to return unsigned int value.

Fixes: 628a5c56 ("[INET]: Add IP(V6)_PMTUDISC_RPOBE")
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarVadim Fedorenko <vfedorenko@novek.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8906626a

include/net/ip6_route.h

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static inline bool ipv6_anycast_destination(const struct dst_entry *dst, 
int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,

		 int (*output)(struct net *, struct sock *, struct sk_buff *));



static inline int ip6_skb_dst_mtu(struct sk_buff *skb)

static inline unsigned int ip6_skb_dst_mtu(struct sk_buff *skb)

{

	struct ipv6_pinfo *np = skb->sk && !dev_recursion_level() ?

				inet6_sk(skb->sk) : NULL;

net/ipv6/xfrm6_output.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb) 
{

	struct dst_entry *dst = skb_dst(skb);

	struct xfrm_state *x = dst->xfrm;

	int mtu;

	unsigned int mtu;

	bool toobig;



#ifdef CONFIG_NETFILTER