diff options
author | zhanglin <zhang.lin16@zte.com.cn> | 2019-10-26 15:54:16 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-10 11:34:40 +0100 |
commit | 46c2e4f232b1af8e9e98c9ad9f19a558d7c88335 (patch) | |
tree | 691fe374f14195ec67dd1ca0076401d96a8d7a9d | |
parent | 820a44df2058d7aa41340dd30a55c4b13a64d08c (diff) | |
download | linux-stable-46c2e4f232b1af8e9e98c9ad9f19a558d7c88335.tar.gz linux-stable-46c2e4f232b1af8e9e98c9ad9f19a558d7c88335.tar.bz2 linux-stable-46c2e4f232b1af8e9e98c9ad9f19a558d7c88335.zip |
net: Zeroing the structure ethtool_wolinfo in ethtool_get_wol()
[ Upstream commit 5ff223e86f5addbfae26419cbb5d61d98f6fbf7d ]
memset() the structure ethtool_wolinfo that has padded bytes
but the padded bytes have not been zeroed out.
Signed-off-by: zhanglin <zhang.lin16@zte.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | net/core/ethtool.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 6288e69e94fc..563a48c3df36 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -1395,11 +1395,13 @@ static int ethtool_reset(struct net_device *dev, char __user *useraddr) static int ethtool_get_wol(struct net_device *dev, char __user *useraddr) { - struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL }; + struct ethtool_wolinfo wol; if (!dev->ethtool_ops->get_wol) return -EOPNOTSUPP; + memset(&wol, 0, sizeof(struct ethtool_wolinfo)); + wol.cmd = ETHTOOL_GWOL; dev->ethtool_ops->get_wol(dev, &wol); if (copy_to_user(useraddr, &wol, sizeof(wol))) |