From cf7cbebb2bd9e23028f886ed74d7cdc9b469ea47 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sat, 23 May 2020 17:40:25 +0200 Subject: [PATCH] ethtool: propagate get_coalesce return value 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 Signed-off-by: David S. Miller Signed-off-by: hongrongxuan --- 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 2d73b659e628..cfb2312ba1df 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -1472,11 +1472,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;