Commit c3f52ae6 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

socket: suppress sparse warnings 



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

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e13e02a3

net/socket.c

+5 −3
Original line number Diff line number Diff line
@@ -2648,7 +2648,8 @@ static int bond_ioctl(struct net *net, unsigned int cmd, 


		old_fs = get_fs();

		set_fs(KERNEL_DS);

		err = dev_ioctl(net, cmd, &kifr);

		err = dev_ioctl(net, cmd,

				(struct ifreq __user __force *) &kifr);

		set_fs(old_fs);



		return err;
@@ -2757,7 +2758,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd, 


	old_fs = get_fs();

	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);



	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));

		if (rtdev) {

			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

			r4.rt_dev = NULL;