Merge "net: Zeroing the structure ethtool_wolinfo in ethtool_get_wol()"

This commit is contained in:
Linux Build Service Account 2014-07-14 15:18:00 -07:00 committed by Gerrit - the friendly Code Review server
commit e616d5738d

View file

@ -711,11 +711,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)))