Commit d9ed3aed authored Feb 28, 2018 by Edward Cree Committed by Greg Kroah-Hartman May 30, 2018

net: ethtool: don't ignore return from driver get_fecparam method



[ Upstream commit a6d50512b4d86ecd9f5952525e454583be1c3b14 ]

If ethtool_ops->get_fecparam returns an error, pass that error on to the
 user, rather than ignoring it.

Fixes: 1a5f3da2 ("net: ethtool: add support for forward error correction modes")
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent f03cd586

net/core/ethtool.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -2505,11 +2505,14 @@ static int set_phy_tunable(struct net_device dev, void __user useraddr)
		static int ethtool_get_fecparam(struct net_device dev, void __user useraddr)
		{
		struct ethtool_fecparam fecparam = { ETHTOOL_GFECPARAM };
		int rc;

		if (!dev->ethtool_ops->get_fecparam)
		return -EOPNOTSUPP;

		dev->ethtool_ops->get_fecparam(dev, &fecparam);
		rc = dev->ethtool_ops->get_fecparam(dev, &fecparam);
		if (rc)
		return rc;

		if (copy_to_user(useraddr, &fecparam, sizeof(fecparam)))
		return -EFAULT;