diff options
| author | Johannes Berg | 2019-01-25 22:43:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-02-27 10:08:59 +0100 |
| commit | e37c96c11175dec4f1b49b25180097ecd80c8c8e (patch) | |
| tree | ffa37748a42a3e159332d87d18a1b843c50bcc46 /net/socket.c | |
| parent | Revert "kill dev_ifsioc()" (diff) | |
| download | kernel-qcow2-linux-e37c96c11175dec4f1b49b25180097ecd80c8c8e.tar.gz kernel-qcow2-linux-e37c96c11175dec4f1b49b25180097ecd80c8c8e.tar.xz kernel-qcow2-linux-e37c96c11175dec4f1b49b25180097ecd80c8c8e.zip | |
net: socket: fix SIOCGIFNAME in compat
[ Upstream commit c6c9fee35dc27362b7bac34b2fc9f5b8ace2e22c ]
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: 4cf808e7ac32 ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index e74ede56e903..3b954cafd6a9 100644 --- a/net/socket.c +++ b/net/socket.c @@ -3001,6 +3001,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; @@ -3224,6 +3225,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: @@ -3238,7 +3240,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); } |