Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

net/sched/cls_api.c has overlapping changes to a call to
nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL
to the 5th argument, and another (from 'net-next') added cb->extack
instead of NULL to the 6th argument.

net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to
code which moved (to mr_table_dump)) in 'net-next'.  Thanks to David
Ahern for the heads up.

Signed-off-by: David S. Miller <davem@davemloft.net>

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;
         }