lkml.org 
[lkml]   [2017]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 220/233] net: prevent sign extension in dev_get_stats()
    3.16.48-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Eric Dumazet <edumazet@google.com>

    commit 6f64ec74515925cced6df4571638b5a099a49aae upstream.

    Similar to the fix provided by Dominik Heidler in commit
    9b3dc0a17d73 ("l2tp: cast l2tp traffic counter to unsigned")
    we need to take care of 32bit kernels in dev_get_stats().

    When using atomic_long_read(), we add a 'long' to u64 and
    might misinterpret high order bit, unless we cast to unsigned.

    Fixes: caf586e5f23ce ("net: add a core netdev->rx_dropped counter")
    Fixes: 015f0688f57ca ("net: net: add a core netdev->tx_dropped counter")
    Fixes: 6e7333d315a76 ("net: add rx_nohandler stat counter")
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: Jarod Wilson <jarod@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    [bwh: Backported to 3.16: only {rx,tx}_dropped are updated here]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    --- a/net/core/dev.c
    +++ b/net/core/dev.c
    @@ -6509,8 +6509,8 @@ struct rtnl_link_stats64 *dev_get_stats(
    } else {
    netdev_stats_to_stats64(storage, &dev->stats);
    }
    - storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
    - storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
    + storage->rx_dropped += (unsigned long)atomic_long_read(&dev->rx_dropped);
    + storage->tx_dropped += (unsigned long)atomic_long_read(&dev->tx_dropped);
    return storage;
    }
    EXPORT_SYMBOL(dev_get_stats);
    \
     
     \ /
      Last update: 2017-09-10 00:32    [W:4.244 / U:0.376 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site