diff options
| author | Johannes Berg | 2019-01-25 22:43:20 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-02-27 10:08:59 +0100 |
| commit | 7aab1e6d9edb71f4ba2969de4d8ae17e887b8126 (patch) | |
| tree | dc039d765137cc31c45f9025e56ec6f6acfbb08b /net/socket.c | |
| parent | net: socket: fix SIOCGIFNAME in compat (diff) | |
| download | kernel-qcow2-linux-7aab1e6d9edb71f4ba2969de4d8ae17e887b8126.tar.gz kernel-qcow2-linux-7aab1e6d9edb71f4ba2969de4d8ae17e887b8126.tar.xz kernel-qcow2-linux-7aab1e6d9edb71f4ba2969de4d8ae17e887b8126.zip | |
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: f92d4fc95341 ("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>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/socket.c b/net/socket.c index 3b954cafd6a9..5c820212ba81 100644 --- a/net/socket.c +++ b/net/socket.c @@ -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); } |