iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: move copy_from_user() out of net_hwtstamp_validate()

Browse Source 
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>
This commit is contained in:
Vladimir Oltean 2023-04-02 15:37:52 +03:00 committed by David S. Miller
parent 4ee58e1e56
commit d5d5fd8f25
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/core/dev_ioctl.c
View File

@ -183,22 +183,18 @@ static int dev_ifsioc_locked(struct net *net, struct ifreq *ifr, unsigned int cm
return err; 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_tx_types tx_type;
enum hwtstamp_rx_filters rx_filter; enum hwtstamp_rx_filters rx_filter;
int tx_type_valid = 0; int tx_type_valid = 0;
int rx_filter_valid = 0; int rx_filter_valid = 0;
if (copy_from_user(&cfg, ifr->ifr_data, sizeof(cfg))) if (cfg->flags & ~HWTSTAMP_FLAG_MASK)
return -EFAULT;
if (cfg.flags & ~HWTSTAMP_FLAG_MASK)
return -EINVAL; return -EINVAL;
tx_type = cfg.tx_type; tx_type = cfg->tx_type;
rx_filter = cfg.rx_filter; rx_filter = cfg->rx_filter;
switch (tx_type) { switch (tx_type) {
case HWTSTAMP_TX_OFF: 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) static int dev_set_hwtstamp(struct net_device *dev, struct ifreq *ifr)
{ {
struct hwtstamp_config cfg;
int err; 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) if (err)
return err; return err;