AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ethtool: Allow zero-length register dumps again

Browse Source 
Some drivers (ab)use the ethtool_ops::get_regs operation to expose
only a hardware revision ID.  Commit
a77f5db361 ('ethtool: Allocate register
dump buffer with vmalloc()') had the side-effect of breaking these, as
vmalloc() returns a null pointer for size=0 whereas kmalloc() did not.

For backward-compatibility, allow zero-length dumps again.

Reported-by: Kalle Valo <kvalo@qca.qualcomm.com>
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Cc: stable@kernel.org [2.6.37+]
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ben Hutchings 2011-07-21 15:25:30 -07:00 committed by David S. Miller
parent 1511022c9a
commit 67ae7cf1ee
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/core/ethtool.c
View File

@ -923,7 +923,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)
regs.len = reglen; regs.len = reglen;
regbuf = vzalloc(reglen); regbuf = vzalloc(reglen);
if (!regbuf) if (reglen && !regbuf)
return -ENOMEM; return -ENOMEM;
ops->get_regs(dev, &regs, regbuf); ops->get_regs(dev, &regs, regbuf);
@ -932,7 +932,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)
if (copy_to_user(useraddr, &regs, sizeof(regs))) if (copy_to_user(useraddr, &regs, sizeof(regs)))
goto out; goto out;
useraddr += offsetof(struct ethtool_regs, data); useraddr += offsetof(struct ethtool_regs, data);
if (copy_to_user(useraddr, regbuf, regs.len)) if (regbuf && copy_to_user(useraddr, regbuf, regs.len))
goto out; goto out;
ret = 0; ret = 0;