summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorKangjie Lu <kangjielu@gmail.com>2016-05-03 16:46:24 -0400
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-13 12:17:27 -0700
commit4e09e763ebd22640ad67bc9cb7d35c73684a3fde (patch)
tree092d3f494c237d03c18141d130e7df371664883b /net
parent9b82a4c5896632b62140d1ddda55638fea254007 (diff)
net: fix infoleak in rtnetlink
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”. Change-Id: I41f4745f24720c7af5ab08dc4274224d7fe4dcfe Signed-off-by: Kangjie Lu <kjlu@gatech.edu> Signed-off-by: David S. Miller <davem@davemloft.net> Git-repo: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git Git-commit: 5f8e44741f9f216e33736ea4ec65ca9ac03036e6 Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
Diffstat (limited to 'net')
-rw-r--r--net/core/rtnetlink.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index ca966f7de351..87b91ffbdec3 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1175,14 +1175,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;