p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix missing copy_from_user in macvtap 

Fix missing copy_from_user in macvtap SIOCSIFHWADDR ioctl.

Signed-off-by: Justin Cormack <justin@netbsd.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Justin Cormack 2015-05-13 19:19:02 +01:00 committed by David S. Miller
parent 42275bd8fc
commit 7f460d30c8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/macvtap.c
View File

@ -1006,6 +1006,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
unsigned int __user *up = argp; unsigned int __user *up = argp;
unsigned short u; unsigned short u;
int __user *sp = argp; int __user *sp = argp;
struct sockaddr sa;
int s; int s;
int ret; int ret;
@ -1119,13 +1120,15 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
return ret; return ret;
case SIOCSIFHWADDR: case SIOCSIFHWADDR:
if (copy_from_user(&sa, &ifr->ifr_hwaddr, sizeof(sa)))
return -EFAULT;
rtnl_lock(); rtnl_lock();
vlan = macvtap_get_vlan(q); vlan = macvtap_get_vlan(q);
if (!vlan) { if (!vlan) {
rtnl_unlock(); rtnl_unlock();
return -ENOLINK; return -ENOLINK;
} }
ret = dev_set_mac_address(vlan->dev, &ifr->ifr_hwaddr); ret = dev_set_mac_address(vlan->dev, &sa);
macvtap_put_vlan(vlan); macvtap_put_vlan(vlan);
rtnl_unlock(); rtnl_unlock();
return ret; return ret;