diff options
| author | kangjie <kangjielu@gmail.com> | 2016-05-03 21:49:23 -0400 |
|---|---|---|
| committer | Gediminas Ramanauskas <gedis@google.com> | 2016-06-22 17:05:32 -0700 |
| commit | f3aa758d997877557afc249dfc45db452e585f6f (patch) | |
| tree | 9a441d48d9a10179a4807b9f88c83d90a994241c | |
| parent | b61a942ad02a8d206ff2efe7800643303653aa1c (diff) | |
| download | mediatek-android-mediatek-sprout-3.10-marshmallow-mr2.tar.gz | |
fix infoleak in rtnetlinkandroid-6.0.1_r0.110android-mediatek-sprout-3.10-marshmallow-mr2
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: 28620102
Change-Id: I13da380c6fe8abca49e3cf9f05293c02b44d2e5e
Signed-off-by: kangjie <kangjielu@gmail.com>
| -rw-r--r-- | net/core/rtnetlink.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 808c83b1f264..685d5fe19cf7 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -910,14 +910,14 @@ 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; } |