Skip to content

Commit 40fc305

Browse files
vvfedorenkodavem330
authored andcommitted
net: ipv6: fix return value of ip6_skb_dst_mtu
Commit 628a5c5 ("[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: 628a5c5 ("[INET]: Add IP(V6)_PMTUDISC_RPOBE") Reviewed-by: David Ahern <[email protected]> Signed-off-by: Vadim Fedorenko <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent bde3c8f commit 40fc305

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

include/net/ip6_route.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ static inline bool ipv6_anycast_destination(const struct dst_entry *dst,
263263
int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,
264264
int (*output)(struct net *, struct sock *, struct sk_buff *));
265265

266-
static inline int ip6_skb_dst_mtu(struct sk_buff *skb)
266+
static inline unsigned int ip6_skb_dst_mtu(struct sk_buff *skb)
267267
{
268268
int mtu;
269269

net/ipv6/xfrm6_output.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb)
4949
{
5050
struct dst_entry *dst = skb_dst(skb);
5151
struct xfrm_state *x = dst->xfrm;
52-
int mtu;
52+
unsigned int mtu;
5353
bool toobig;
5454

5555
#ifdef CONFIG_NETFILTER

0 commit comments

Comments
 (0)