* [PATCH net-next] ethtool: propagate get_coalesce return value
@ 2020-05-23 15:40 Heiner Kallweit
2020-05-23 23:57 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Heiner Kallweit @ 2020-05-23 15:40 UTC (permalink / raw)
To: David Miller, Jakub Kicinski; +Cc: netdev
get_coalesce returns 0 or ERRNO, but the return value isn't checked.
The returned coalesce data may be invalid if an ERRNO is set,
therefore better check and propagate the return value.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
net/ethtool/ioctl.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index eeb1137a3..923e220ff 100644
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -1510,11 +1510,14 @@ static noinline_for_stack int ethtool_get_coalesce(struct net_device *dev,
void __user *useraddr)
{
struct ethtool_coalesce coalesce = { .cmd = ETHTOOL_GCOALESCE };
+ int ret;
if (!dev->ethtool_ops->get_coalesce)
return -EOPNOTSUPP;
- dev->ethtool_ops->get_coalesce(dev, &coalesce);
+ ret = dev->ethtool_ops->get_coalesce(dev, &coalesce);
+ if (ret)
+ return ret;
if (copy_to_user(useraddr, &coalesce, sizeof(coalesce)))
return -EFAULT;
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] ethtool: propagate get_coalesce return value
2020-05-23 15:40 [PATCH net-next] ethtool: propagate get_coalesce return value Heiner Kallweit
@ 2020-05-23 23:57 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-05-23 23:57 UTC (permalink / raw)
To: hkallweit1; +Cc: kuba, netdev
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Sat, 23 May 2020 17:40:25 +0200
> get_coalesce returns 0 or ERRNO, but the return value isn't checked.
> The returned coalesce data may be invalid if an ERRNO is set,
> therefore better check and propagate the return value.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Applied, thanks Heiner.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-23 23:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-23 15:40 [PATCH net-next] ethtool: propagate get_coalesce return value Heiner Kallweit
2020-05-23 23:57 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).