lkml.org 
[lkml]   [2015]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 014/165] ipv4: ip_check_defrag should correctly check return value of skb_copy_bits
    Date
    3.16.7-ckt9 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alexander Drozdov <al.drozdov@gmail.com>

    commit fba04a9e0c869498889b6445fd06cbe7da9bb834 upstream.

    skb_copy_bits() returns zero on success and negative value on error,
    so it is needed to invert the condition in ip_check_defrag().

    Fixes: 1bf3751ec90c ("ipv4: ip_check_defrag must not modify skb before unsharing")
    Signed-off-by: Alexander Drozdov <al.drozdov@gmail.com>
    Acked-by: Eric Dumazet <edumazet@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    net/ipv4/ip_fragment.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
    index ed32313e307c..022b5f49aab7 100644
    --- a/net/ipv4/ip_fragment.c
    +++ b/net/ipv4/ip_fragment.c
    @@ -685,7 +685,7 @@ struct sk_buff *ip_check_defrag(struct sk_buff *skb, u32 user)
    if (skb->protocol != htons(ETH_P_IP))
    return skb;

    - if (!skb_copy_bits(skb, 0, &iph, sizeof(iph)))
    + if (skb_copy_bits(skb, 0, &iph, sizeof(iph)) < 0)
    return skb;

    if (iph.ihl < 5 || iph.version != 4)

    \
     
     \ /
      Last update: 2015-03-25 15:41    [W:9.607 / U:0.940 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site