net: move copy_from_user() out of net_hwtstamp_validate()

The kernel will want to start using the more meaningful struct
hwtstamp_config pointer in more places, so move the copy_from_user() at
the beginning of dev_set_hwtstamp() in order to get to that, and pass
this argument to net_hwtstamp_validate().

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
index 3b1402f6897c58a432a3c2040c27feb2e44da677..34a0da5fbcfcc527d67efbc59d0ffbb5c7c59961 100644 (file)
--- a/net/core/dev_ioctl.c
+++ b/net/core/dev_ioctl.c
@@ -183,22 +183,18 @@ static int dev_ifsioc_locked(struct net *net, struct ifreq *ifr, unsigned int cm
        return err;
 }
 
-static int net_hwtstamp_validate(struct ifreq *ifr)
+static int net_hwtstamp_validate(const struct hwtstamp_config *cfg)
 {
-       struct hwtstamp_config cfg;
        enum hwtstamp_tx_types tx_type;
        enum hwtstamp_rx_filters rx_filter;
        int tx_type_valid = 0;
        int rx_filter_valid = 0;
 
-       if (copy_from_user(&cfg, ifr->ifr_data, sizeof(cfg)))
-               return -EFAULT;
-
-       if (cfg.flags & ~HWTSTAMP_FLAG_MASK)
+       if (cfg->flags & ~HWTSTAMP_FLAG_MASK)
                return -EINVAL;
 
-       tx_type = cfg.tx_type;
-       rx_filter = cfg.rx_filter;
+       tx_type = cfg->tx_type;
+       rx_filter = cfg->rx_filter;
 
        switch (tx_type) {
        case HWTSTAMP_TX_OFF:
@@ -263,9 +259,13 @@ static int dev_get_hwtstamp(struct net_device *dev, struct ifreq *ifr)
 
 static int dev_set_hwtstamp(struct net_device *dev, struct ifreq *ifr)
 {
+       struct hwtstamp_config cfg;
        int err;
 
-       err = net_hwtstamp_validate(ifr);
+       if (copy_from_user(&cfg, ifr->ifr_data, sizeof(cfg)))
+               return -EFAULT;
+
+       err = net_hwtstamp_validate(&cfg);
        if (err)
                return err;