UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

socket: suppress sparse warnings 

Use __force to quiet sparse warnings for cases where the code
is simulating user space pointers.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger 2011-02-23 09:06:48 +00:00 committed by David S. Miller
parent e13e02a3c6
commit c3f52ae6a3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/socket.c
View File

@ -2648,7 +2648,8 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
old_fs = get_fs(); old_fs = get_fs();
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
err = dev_ioctl(net, cmd, &kifr); err = dev_ioctl(net, cmd,
(struct ifreq __user __force *) &kifr);
set_fs(old_fs); set_fs(old_fs);
return err; return err;
@ -2757,7 +2758,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
old_fs = get_fs(); old_fs = get_fs();
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
err = dev_ioctl(net, cmd, (void __user *)&ifr); err = dev_ioctl(net, cmd, (void __user __force *)&ifr);
set_fs(old_fs); set_fs(old_fs);
if (cmd == SIOCGIFMAP && !err) { if (cmd == SIOCGIFMAP && !err) {
@ -2862,7 +2863,8 @@ static int routing_ioctl(struct net *net, struct socket *sock,
ret |= __get_user(rtdev, &(ur4->rt_dev)); ret |= __get_user(rtdev, &(ur4->rt_dev));
if (rtdev) { if (rtdev) {
ret |= copy_from_user(devname, compat_ptr(rtdev), 15); ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
r4.rt_dev = devname; devname[15] = 0; r4.rt_dev = (char __user __force *)devname;
devname[15] = 0;
} else } else
r4.rt_dev = NULL; r4.rt_dev = NULL;