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

Commit 69243164 authored by Kangjie Lu's avatar Kangjie Lu Committed by Sasha Levin
Browse files

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: default avatarKangjie Lu <kjlu@gatech.edu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 84aa6687

net/core/rtnetlink.c

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

	}