mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: [AF_KEY]: suppress a warning for 64k pages. [TIPC]: Fix headercheck wrt. tipc_config.h [COMPAT]: Fix build on COMPAT platforms when CONFIG_NET is disabled. [CONNECTOR]: Fix a spurious kfree_skb() call [COMPAT]: Fix new dev_ifname32 returning -EFAULT [NET]: Fix incorrect sg_mark_end() calls. [IPVS]: Remove /proc/net/ip_vs_lblcr [IPV6]: remove duplicate call to proc_net_remove [NETNS]: fix net released by rcu callback [NET]: Fix free_netdev on register_netdev failure. [WAN]: fix drivers/net/wan/lmc/ compilation
This commit is contained in:
commit
dd13810b42
18 changed files with 111 additions and 173 deletions
|
|
@ -322,7 +322,7 @@ static int dev_ifname32(unsigned int fd, unsigned int cmd, unsigned long arg)
|
|||
int err;
|
||||
|
||||
uifr = compat_alloc_user_space(sizeof(struct ifreq));
|
||||
if (copy_in_user(uifr, compat_ptr(arg), sizeof(struct ifreq32)));
|
||||
if (copy_in_user(uifr, compat_ptr(arg), sizeof(struct ifreq32)))
|
||||
return -EFAULT;
|
||||
|
||||
err = sys_ioctl(fd, SIOCGIFNAME, (unsigned long)uifr);
|
||||
|
|
|
|||
Loading…
Reference in a new issue