diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-31 10:46:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-31 10:46:51 -0400 |
| commit | dd13810b420e0de1fe75bc3b9b14dd2c2c9a4299 (patch) | |
| tree | 37598ca7162d5d440ab554a45d6f64347f4e5df4 /fs | |
| parent | a3634d7169f56eca5e349fce2f1de228fc10efda (diff) | |
| parent | 298bb62175a8e8c2f21f3e00543cda853f423599 (diff) | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/compat_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index a4284ccac1f9..bd26e4cbb994 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -322,7 +322,7 @@ static int dev_ifname32(unsigned int fd, unsigned int cmd, unsigned long arg) | |||
| 322 | int err; | 322 | int err; |
| 323 | 323 | ||
| 324 | uifr = compat_alloc_user_space(sizeof(struct ifreq)); | 324 | uifr = compat_alloc_user_space(sizeof(struct ifreq)); |
| 325 | if (copy_in_user(uifr, compat_ptr(arg), sizeof(struct ifreq32))); | 325 | if (copy_in_user(uifr, compat_ptr(arg), sizeof(struct ifreq32))) |
| 326 | return -EFAULT; | 326 | return -EFAULT; |
| 327 | 327 | ||
| 328 | err = sys_ioctl(fd, SIOCGIFNAME, (unsigned long)uifr); | 328 | err = sys_ioctl(fd, SIOCGIFNAME, (unsigned long)uifr); |