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

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

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



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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c6c9fee3

net/socket.c

+4 −4
Original line number Diff line number Diff line
@@ -3258,16 +3258,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);

	}