Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b40d9bca authored by Kangjie Lu's avatar Kangjie Lu Committed by Mark Salyzyn
Browse files

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: default avatarKangjie Lu <kjlu@gatech.edu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Bug: 28620102
Change-Id: Ica015c6a90d47e9188b1cd87a280ac6819dd9d09
parent 6da57e2f

net/core/rtnetlink.c

+10 −8
Original line number Diff line number Diff line
@@ -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;