Commit 7aab1e6d authored Jan 25, 2019 by Johannes Berg Committed by Greg Kroah-Hartman Feb 27, 2019

net: socket: make bond ioctls go through compat_ifreq_ioctl()



[ Upstream commit 98406133dd9cb9f195676eab540c270dceca879a ]

Same story as before, these use struct ifreq and thus need
to be read with the shorter version to not cause faults.

Cc: stable@vger.kernel.org
Fixes: f92d4fc9 ("kill bond_ioctl()")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent e37c96c1

net/socket.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -3230,16 +3230,16 @@ static int compat_sock_ioctl_trans(struct file file, struct socket sock,
		case SIOCGMIIPHY:
		case SIOCGMIIREG:
		case SIOCSMIIREG:
		case SIOCBONDENSLAVE:
		case SIOCBONDRELEASE:
		case SIOCBONDSETHWADDR:
		case SIOCBONDCHANGEACTIVE:
		return compat_ifreq_ioctl(net, sock, cmd, argp);

		case SIOCSARP:
		case SIOCGARP:
		case SIOCDARP:
		case SIOCATMARK:
		case SIOCBONDENSLAVE:
		case SIOCBONDRELEASE:
		case SIOCBONDSETHWADDR:
		case SIOCBONDCHANGEACTIVE:
		return sock_do_ioctl(net, sock, cmd, arg);
		}