Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63ff03ab authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

Revert "socket: fix struct ifreq size in compat ioctl" 



This reverts commit 1cebf8f1 ("socket: fix struct ifreq
size in compat ioctl"), it's a bugfix for another commit that
I'll revert next.

This is not a 'perfect' revert, I'm keeping some coding style
intact rather than revert to the state with indentation errors.

Cc: stable@vger.kernel.org
Fixes: 1cebf8f1 ("socket: fix struct ifreq size in compat ioctl")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 62967898

net/socket.c

+8 −14
Original line number Diff line number Diff line
@@ -941,8 +941,7 @@ void dlci_ioctl_set(int (*hook) (unsigned int, void __user *)) 
EXPORT_SYMBOL(dlci_ioctl_set);



static long sock_do_ioctl(struct net *net, struct socket *sock,

			  unsigned int cmd, unsigned long arg,

			  unsigned int ifreq_size)

			  unsigned int cmd, unsigned long arg)

{

	int err;

	void __user *argp = (void __user *)arg;
@@ -968,11 +967,11 @@ static long sock_do_ioctl(struct net *net, struct socket *sock, 
	} else {

		struct ifreq ifr;

		bool need_copyout;

		if (copy_from_user(&ifr, argp, ifreq_size))

		if (copy_from_user(&ifr, argp, sizeof(struct ifreq)))

			return -EFAULT;

		err = dev_ioctl(net, cmd, &ifr, &need_copyout);

		if (!err && need_copyout)

			if (copy_to_user(argp, &ifr, ifreq_size))

			if (copy_to_user(argp, &ifr, sizeof(struct ifreq)))

				return -EFAULT;

	}

	return err;
@@ -1071,8 +1070,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
			err = open_related_ns(&net->ns, get_net_ns);

			break;

		default:

			err = sock_do_ioctl(net, sock, cmd, arg,

					    sizeof(struct ifreq));

			err = sock_do_ioctl(net, sock, cmd, arg);

			break;

		}

	return err;
@@ -2780,8 +2778,7 @@ static int do_siocgstamp(struct net *net, struct socket *sock, 
	int err;



	set_fs(KERNEL_DS);

	err = sock_do_ioctl(net, sock, cmd, (unsigned long)&ktv,

			    sizeof(struct compat_ifreq));

	err = sock_do_ioctl(net, sock, cmd, (unsigned long)&ktv);

	set_fs(old_fs);

	if (!err)

		err = compat_put_timeval(&ktv, up);
@@ -2797,8 +2794,7 @@ static int do_siocgstampns(struct net *net, struct socket *sock, 
	int err;



	set_fs(KERNEL_DS);

	err = sock_do_ioctl(net, sock, cmd, (unsigned long)&kts,

			    sizeof(struct compat_ifreq));

	err = sock_do_ioctl(net, sock, cmd, (unsigned long)&kts);

	set_fs(old_fs);

	if (!err)

		err = compat_put_timespec(&kts, up);
@@ -3109,8 +3105,7 @@ static int routing_ioctl(struct net *net, struct socket *sock, 
	}



	set_fs(KERNEL_DS);

	ret = sock_do_ioctl(net, sock, cmd, (unsigned long) r,

			    sizeof(struct compat_ifreq));

	ret = sock_do_ioctl(net, sock, cmd, (unsigned long) r);

	set_fs(old_fs);



out:
@@ -3223,8 +3218,7 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock, 
	case SIOCBONDSETHWADDR:

	case SIOCBONDCHANGEACTIVE:

	case SIOCGIFNAME:

		return sock_do_ioctl(net, sock, cmd, arg,

				     sizeof(struct compat_ifreq));

		return sock_do_ioctl(net, sock, cmd, arg);

	}



	return -ENOIOCTLCMD;