diff options
| author | Kangjie Lu <kangjielu@gmail.com> | 2016-05-03 16:46:24 -0400 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2016-06-24 21:18:38 +0000 |
| commit | b40d9bcad6420669ccf41f69278506125fa68428 (patch) | |
| tree | ca3dbe26c06bb9a80b37e91c4c0ea3fd6ac00fb6 | |
| parent | 6da57e2f0beee58a6570719a865f4e1b1f7822c2 (diff) | |
UPSTREAM: net: fix infoleak in rtnetlink
(cherry pick from commit 5f8e44741f9f216e33736ea4ec65ca9ac03036e6)
The stack object “map” has a total size of 32 bytes. Its last 4
bytes are padding generated by compiler. These padding bytes are
not initialized and sent out via “nla_put”.
Signed-off-by: Kangjie Lu <kjlu@gatech.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Bug: 28620102
Change-Id: Ica015c6a90d47e9188b1cd87a280ac6819dd9d09
| -rw-r--r-- | net/core/rtnetlink.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 34ba7a08876d..9c6d15756e7a 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1174,14 +1174,16 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb, static int rtnl_fill_link_ifmap(struct sk_buff *skb, struct net_device *dev) { - struct rtnl_link_ifmap map = { - .mem_start = dev->mem_start, - .mem_end = dev->mem_end, - .base_addr = dev->base_addr, - .irq = dev->irq, - .dma = dev->dma, - .port = dev->if_port, - }; + struct rtnl_link_ifmap map; + + memset(&map, 0, sizeof(map)); + map.mem_start = dev->mem_start; + map.mem_end = dev->mem_end; + map.base_addr = dev->base_addr; + map.irq = dev->irq; + map.dma = dev->dma; + map.port = dev->if_port; + if (nla_put(skb, IFLA_MAP, sizeof(map), &map)) return -EMSGSIZE; |