diff options
author | Kangjie Lu <kangjielu@gmail.com> | 2016-05-03 16:46:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-18 17:04:01 -0700 |
commit | c1e797692b97ec480bc0e940cc022823e3cc40c9 (patch) | |
tree | a1c1b9cab6cf31085b2ea90630ff4dbfb2510cb8 | |
parent | f3a0b05e04b862ffc549b5635339a5cee00da34d (diff) | |
download | lwn-c1e797692b97ec480bc0e940cc022823e3cc40c9.tar.gz lwn-c1e797692b97ec480bc0e940cc022823e3cc40c9.zip |
net: fix infoleak in rtnetlink
[ Upstream 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 465092f8fb76..ccccc6bfd21c 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1010,14 +1010,16 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev, goto nla_put_failure; if (1) { - 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)) goto nla_put_failure; } |