lkml.org 
[lkml]   [2021]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 11/47] net: ipv6: fix return value of ip6_skb_dst_mtu
    Date
    From: Vadim Fedorenko <vfedorenko@novek.ru>

    commit 40fc3054b45820c28ea3c65e2c86d041dc244a8a upstream.

    Commit 628a5c561890 ("[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: 628a5c561890 ("[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>
    ---
    include/net/ip6_route.h | 2 +-
    net/ipv6/xfrm6_output.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    --- a/include/net/ip6_route.h
    +++ b/include/net/ip6_route.h
    @@ -181,7 +181,7 @@ static inline bool ipv6_anycast_destinat
    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;
    --- a/net/ipv6/xfrm6_output.c
    +++ b/net/ipv6/xfrm6_output.c
    @@ -141,7 +141,7 @@ static int __xfrm6_output(struct net *ne
    {
    struct dst_entry *dst = skb_dst(skb);
    struct xfrm_state *x = dst->xfrm;
    - int mtu;
    + unsigned int mtu;
    bool toobig;

    #ifdef CONFIG_NETFILTER

    \
     
     \ /
      Last update: 2021-07-26 17:41    [W:4.104 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site