Skip to content

Commit 27c28d1

Browse files
vvfedorenkoksacilotto
authored andcommitted
net: ipv6: fix return value of ip6_skb_dst_mtu
BugLink: https://bugs.launchpad.net/bugs/1939442 commit 40fc305 upstream. 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 <dsahern@kernel.org> Signed-off-by: Vadim Fedorenko <vfedorenko@novek.ru> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
1 parent 791f0fe commit 27c28d1

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
@@ -261,7 +261,7 @@ static inline bool ipv6_anycast_destination(const struct dst_entry *dst,
261261
int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,
262262
int (*output)(struct net *, struct sock *, struct sk_buff *));
263263

264-
static inline int ip6_skb_dst_mtu(struct sk_buff *skb)
264+
static inline unsigned int ip6_skb_dst_mtu(struct sk_buff *skb)
265265
{
266266
int mtu;
267267

net/ipv6/xfrm6_output.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb)
144144
{
145145
struct dst_entry *dst = skb_dst(skb);
146146
struct xfrm_state *x = dst->xfrm;
147-
int mtu;
147+
unsigned int mtu;
148148
bool toobig;
149149

150150
#ifdef CONFIG_NETFILTER

0 commit comments

Comments
 (0)