Commit c6c9fee3 authored Jan 25, 2019 by Johannes Berg Committed by David S. Miller Jan 30, 2019

net: socket: fix SIOCGIFNAME in compat

As reported by Robert O'Callahan in
https://bugzilla.kernel.org/show_bug.cgi?id=202273
reverting the previous changes in this area broke
the SIOCGIFNAME ioctl in compat again (I'd previously
fixed it after his previous report of breakage in
https://bugzilla.kernel.org/show_bug.cgi?id=199469

).

This is obviously because I fixed SIOCGIFNAME more or
less by accident.

Fix it explicitly now by making it pass through the
restored compat translation code.

Cc: stable@vger.kernel.org
Fixes: 4cf808e7 ("kill dev_ifname32()")
Reported-by: Robert O'Callahan <robert@ocallahan.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 37ac39bd

net/socket.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3029,6 +3029,7 @@ static int compat_ifreq_ioctl(struct net net, struct socket sock,
		case SIOCGIFTXQLEN:
		case SIOCGMIIPHY:
		case SIOCGMIIREG:
		case SIOCGIFNAME:
		if (copy_in_user(uifr32, uifr, sizeof(*uifr32)))
		err = -EFAULT;
		break;
		@@ -3252,6 +3253,7 @@ static int compat_sock_ioctl_trans(struct file file, struct socket sock,
		case SIOCSIFTXQLEN:
		case SIOCBRADDIF:
		case SIOCBRDELIF:
		case SIOCGIFNAME:
		case SIOCSIFNAME:
		case SIOCGMIIPHY:
		case SIOCGMIIREG:
		@@ -3266,7 +3268,6 @@ static int compat_sock_ioctl_trans(struct file file, struct socket sock,
		case SIOCBONDRELEASE:
		case SIOCBONDSETHWADDR:
		case SIOCBONDCHANGEACTIVE:
		case SIOCGIFNAME:
		return sock_do_ioctl(net, sock, cmd, arg);
		}