提交 a76e88c2 编写于 作者: D Dan Carpenter 提交者: Jakub Kicinski

net: dsa: microchip: ptp: Fix error code in ksz_hwtstamp_set()

We want to return negative error codes here but the copy_to/from_user()
functions return the number of bytes remaining to be copied.

Fixes: c59e12a1 ("net: dsa: microchip: ptp: Initial hardware time stamping support")
Signed-off-by: NDan Carpenter <error27@gmail.com>
Reviewed-by: NVladimir Oltean <olteanv@gmail.com>
Link: https://lore.kernel.org/r/Y8fJxSvbl7UNVHh/@kiliSigned-off-by: NJakub Kicinski <kuba@kernel.org>
上级 482acbd6
...@@ -416,9 +416,8 @@ int ksz_hwtstamp_set(struct dsa_switch *ds, int port, struct ifreq *ifr) ...@@ -416,9 +416,8 @@ int ksz_hwtstamp_set(struct dsa_switch *ds, int port, struct ifreq *ifr)
prt = &dev->ports[port]; prt = &dev->ports[port];
ret = copy_from_user(&config, ifr->ifr_data, sizeof(config)); if (copy_from_user(&config, ifr->ifr_data, sizeof(config)))
if (ret) return -EFAULT;
return ret;
ret = ksz_set_hwtstamp_config(dev, prt, &config); ret = ksz_set_hwtstamp_config(dev, prt, &config);
if (ret) if (ret)
...@@ -426,7 +425,10 @@ int ksz_hwtstamp_set(struct dsa_switch *ds, int port, struct ifreq *ifr) ...@@ -426,7 +425,10 @@ int ksz_hwtstamp_set(struct dsa_switch *ds, int port, struct ifreq *ifr)
memcpy(&prt->tstamp_config, &config, sizeof(config)); memcpy(&prt->tstamp_config, &config, sizeof(config));
return copy_to_user(ifr->ifr_data, &config, sizeof(config)); if (copy_to_user(ifr->ifr_data, &config, sizeof(config)))
return -EFAULT;
return 0;
} }
static ktime_t ksz_tstamp_reconstruct(struct ksz_device *dev, ktime_t tstamp) static ktime_t ksz_tstamp_reconstruct(struct ksz_device *dev, ktime_t tstamp)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册