net: fix infoleak in rtnetlink
Kangjie Lu [Tue, 3 May 2016 20:46:24 +0000 (16:46 -0400)]
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”.

Bug 1787007

Change-Id: I33c4a566efc17fc6a8c6d850bc3e9602d7a996ad
Signed-off-by: Kangjie Lu <kjlu@gatech.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Woojung Min <wmin@nvidia.com>
(cherry picked from commit 5f8e44741f9f216e33736ea4ec65ca9ac03036e6)
Reviewed-on: http://git-master/r/1196545
GVS: Gerrit_Virtual_Submit
Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Signed-off-by: Mithun Maragiri <mmaragiri@nvidia.com>
Reviewed-on: http://git-master/r/1199480
Reviewed-by: Vinayak Pane <vpane@nvidia.com>
(cherry picked from commit b9b0f6f46a8723e5c3198840d6548c54d9df9b98)
Reviewed-on: http://git-master/r/1203356

net/core/rtnetlink.c

index a67310e..602c6d0 100644 (file)
@@ -899,14 +899,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;
        }