Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9df4f031 authored by Austin Kim's avatar Austin Kim Committed by Sasha Levin
Browse files

net: ethtool: clear heap allocations for ethtool function 



[ Upstream commit 80ec82e3d2c1fab42eeb730aaa7985494a963d3f ]

Several ethtool functions leave heap uncleared (potentially) by
drivers. This will leave the unused portion of heap unchanged and
might copy the full contents back to userspace.

Signed-off-by: default avatarAustin Kim <austindh.kim@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 62aed2df

net/core/ethtool.c

+5 −5
Original line number Diff line number Diff line
@@ -1508,7 +1508,7 @@ static int ethtool_get_any_eeprom(struct net_device *dev, void __user *useraddr, 
	if (eeprom.offset + eeprom.len > total_len)

		return -EINVAL;



	data = kmalloc(PAGE_SIZE, GFP_USER);

	data = kzalloc(PAGE_SIZE, GFP_USER);

	if (!data)

		return -ENOMEM;
@@ -1573,7 +1573,7 @@ static int ethtool_set_eeprom(struct net_device *dev, void __user *useraddr) 
	if (eeprom.offset + eeprom.len > ops->get_eeprom_len(dev))

		return -EINVAL;



	data = kmalloc(PAGE_SIZE, GFP_USER);

	data = kzalloc(PAGE_SIZE, GFP_USER);

	if (!data)

		return -ENOMEM;
@@ -1764,7 +1764,7 @@ static int ethtool_self_test(struct net_device *dev, char __user *useraddr) 
		return -EFAULT;



	test.len = test_len;

	data = kmalloc_array(test_len, sizeof(u64), GFP_USER);

	data = kcalloc(test_len, sizeof(u64), GFP_USER);

	if (!data)

		return -ENOMEM;
@@ -2295,7 +2295,7 @@ static int ethtool_get_tunable(struct net_device *dev, void __user *useraddr) 
	ret = ethtool_tunable_valid(&tuna);

	if (ret)

		return ret;

	data = kmalloc(tuna.len, GFP_USER);

	data = kzalloc(tuna.len, GFP_USER);

	if (!data)

		return -ENOMEM;

	ret = ops->get_tunable(dev, &tuna, data);
@@ -2481,7 +2481,7 @@ static int get_phy_tunable(struct net_device *dev, void __user *useraddr) 
	ret = ethtool_phy_tunable_valid(&tuna);

	if (ret)

		return ret;

	data = kmalloc(tuna.len, GFP_USER);

	data = kzalloc(tuna.len, GFP_USER);

	if (!data)

		return -ENOMEM;

	mutex_lock(&phydev->lock);