lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 200/496] net: ethtool: dont ignore return from driver get_fecparam method
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Edward Cree <ecree@solarflare.com>

    [ Upstream commit a6d50512b4d86ecd9f5952525e454583be1c3b14 ]

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

    Fixes: 1a5f3da20bd9 ("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>
    ---
    net/core/ethtool.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/net/core/ethtool.c
    +++ b/net/core/ethtool.c
    @@ -2505,11 +2505,14 @@ static int set_phy_tunable(struct net_de
    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;

    \
     
     \ /
      Last update: 2018-05-28 15:17    [W:5.573 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site