Skip to content

Commit

Permalink
net: fix infoleak in rtnetlink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
kengiter authored and davem330 committed May 4, 2016
1 parent b8670c0 commit 5f8e447
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions net/core/rtnetlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -1180,14 +1180,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;

Expand Down

0 comments on commit 5f8e447

Please sign in to comment.