Commit 7b441b25 authored Oct 26, 2019 by zhanglin Committed by Greg Kroah-Hartman Nov 10, 2019

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>

parent 7d0d649f

net/core/ethtool.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1438,11 +1438,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)))