]> git.baikalelectronics.ru Git - kernel.git/commit
gen_stats: Fix netlink stats dumping in the presence of padding
authorToke Høiland-Jørgensen <toke@toke.dk>
Mon, 2 Jul 2018 20:52:20 +0000 (22:52 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Jul 2018 05:44:45 +0000 (14:44 +0900)
commitaf0ae2289ae1742b1b2f3c1a35dd299563ae3804
tree092ae617e867b7a9d3923724c178b1bcae6305dc
parent548df3e8f8a354484700038ab59855caa0d5aadf
gen_stats: Fix netlink stats dumping in the presence of padding

The gen_stats facility will add a header for the toplevel nlattr of type
TCA_STATS2 that contains all stats added by qdisc callbacks. A reference
to this header is stored in the gnet_dump struct, and when all the
per-qdisc callbacks have finished adding their stats, the length of the
containing header will be adjusted to the right value.

However, on architectures that need padding (i.e., that don't set
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS), the padding nlattr is added
before the stats, which means that the stored pointer will point to the
padding, and so when the header is fixed up, the result is just a very
big padding nlattr. Because most qdiscs also supply the legacy TCA_STATS
struct, this problem has been mostly invisible, but we exposed it with
the netlink attribute-based statistics in CAKE.

Fix the issue by fixing up the stored pointer if it points to a padding
nlattr.

Tested-by: Pete Heist <pete@heistp.net>
Tested-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/gen_stats.c