diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-06-27 07:02:20 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-09-15 18:30:16 +0100 |
| commit | 6956b55db9f79fb0d595093fb1e3e0b05aab75fb (patch) | |
| tree | 92f9de625b9d4bd71eaf519ffc3ca3691b4f4b8e | |
| parent | 58347335b9c2fd670c2c56e0b26dcfb0454732ce (diff) | |
| download | linux-stable-6956b55db9f79fb0d595093fb1e3e0b05aab75fb.tar.gz linux-stable-6956b55db9f79fb0d595093fb1e3e0b05aab75fb.tar.bz2 linux-stable-6956b55db9f79fb0d595093fb1e3e0b05aab75fb.zip | |
net: prevent sign extension in dev_get_stats()
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>
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 1441a4934c18..278faa3933ad 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6509,8 +6509,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev, } 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); |