From 80584fc8398d36d039c026c0cd8ab6f3dbdca2bc Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 21 Feb 2019 05:22:40 +0000 Subject: [PATCH] net: socket: make bond ioctls go through compat_ifreq_ioctl() mainline inclusion from mainline-5.0 commit 98406133dd9c category: bugfix bugzilla: 9397 CVE: NA ------------------------------------------------- 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 Signed-off-by: David S. Miller Signed-off-by: Zhiqiang Liu Reviewed-by: Mao Wenan Signed-off-by: Yang Yingliang --- net/socket.c | 8 ++++---- 1 file 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); } -- GitLab