]> git.hungrycats.org Git - linux/commitdiff
[PATCH] sparse: final bits of compat_ioctl
authorAlexander Viro <viro@parcelfarce.linux.theplanet.co.uk>
Sat, 29 May 2004 11:44:03 +0000 (04:44 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 29 May 2004 11:44:03 +0000 (04:44 -0700)
ethtool_ioctl() annotated; it would go in the first compat_ioctl
chunk (trivial ones) if it wouldn't be right after SIOCGIFCONF mess; was
easier to split in that order...

fs/compat_ioctl.c

index e6e436e52954b6e79017b2652a7d54a85e2ab19f..c14b9cd979d641f9499f0b609e989ff711a8241d 100644 (file)
@@ -559,10 +559,10 @@ static int dev_ifconf(unsigned int fd, unsigned int cmd, unsigned long arg)
 
 static int ethtool_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
 {
-       struct ifreq *ifr;
-       struct ifreq32 *ifr32;
+       struct ifreq __user *ifr;
+       struct ifreq32 __user *ifr32;
        u32 data;
-       void *datap;
+       void __user *datap;
        
        ifr = compat_alloc_user_space(sizeof(*ifr));
        ifr32 = compat_ptr(arg);