1 files changed, 8 insertions, 3 deletions

diff --git a/net/socket.c b/net/socket.c
index 713dc4833d40..b68801c7d0ab 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2875,9 +2875,14 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
                     copy_in_user(&rxnfc->fs.ring_cookie,
                                  &compat_rxnfc->fs.ring_cookie,
                                  (void __user *)(&rxnfc->fs.location + 1) -
-                                 (void __user *)&rxnfc->fs.ring_cookie) ||
-                    copy_in_user(&rxnfc->rule_cnt, &compat_rxnfc->rule_cnt,
-                                 sizeof(rxnfc->rule_cnt)))
+                                 (void __user *)&rxnfc->fs.ring_cookie))
+                        return -EFAULT;
+                if (ethcmd == ETHTOOL_GRXCLSRLALL) {
+                        if (put_user(rule_cnt, &rxnfc->rule_cnt))
+                                return -EFAULT;
+                } else if (copy_in_user(&rxnfc->rule_cnt,
+                                        &compat_rxnfc->rule_cnt,
+                                        sizeof(rxnfc->rule_cnt)))
                         return -EFAULT;
         }