Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2708382pxj; Mon, 31 May 2021 08:45:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3SkCczHhmmfkzkiCdOGqraMNdMM53OuNX6NUWSnk5B1RivL9LEirdgSQPxSsUMBzxerTe X-Received: by 2002:a05:6402:19a:: with SMTP id r26mr25913131edv.44.1622475956473; Mon, 31 May 2021 08:45:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622475956; cv=none; d=google.com; s=arc-20160816; b=IdLk6lGTJSsFeAItNrTkePF020ZaSPqBuFjnZ+lnryAyZlNdI8/Ss3gZK2oK4mwIYp LnPenZqzM+Z43le/msg6E93ZfoLKwzba0dJ2aAs6ueBPdm5xrgY0hRAnHnAqbpG+ArsL BlwmPRk0wplQsQK5CvBBCgpvvQ9f2SbXC3JzfvT/IUj1tDRVHs0jGBgtX9PAErVwG3um zUZOsiuqXxEkM21fyhFyLJJzJKWTpHBmZHO0wuK+F5C4pGj1UaUmtGWQIFK59OmwyurE Gz8pOs/XQR3AWPo5mfOfKiczsoEngDiav1WnSHqv+S52jgc3LZLzPbL0OdZLFgmiD2+i SVxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Ph/xWbiijAUx0qSz+VLWJ/lyGQ7CuDPqKFZxlG9B8EE=; b=vSbWJV3X7uST43LQAxXuZYsagjU9udhD/A2w/qrI4dRqUn5kIOZGqih7GvrOxcmn3j 0+pXH3rQz9zPdILazcCa3KnXlhqFDgbOtWRohDEgLSbgZlq6OaKxwp0HtRzr3/be1fyu YmjKwBVvR5mH+Di0S8U2sw3j/M4/U5SGGOZRsTVwBv6R/EHT8oYvNg4+TJmjUmmKlMRj V8csjVMbVmuMejOtpkM6LmygSnw7FgS+RkKaG8pFf4G3vo3UiAEIm4VLhJ89KhekWMel K70QaNECgoUE5fgiAPh7UjJ0yCofBSWk5aprvigcGxoGV/cWN5QstwQE2CY8qxIk7fLI CQfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="ob/BEOgi"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id rh9si14400590ejb.589.2021.05.31.08.45.34; Mon, 31 May 2021 08:45:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="ob/BEOgi"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232690AbhEaPqH (ORCPT + 99 others); Mon, 31 May 2021 11:46:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:48832 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232509AbhEaOZb (ORCPT ); Mon, 31 May 2021 10:25:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D9E8C61108; Mon, 31 May 2021 13:46:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1622468805; bh=TEOEsm9FkAMDY1iDoO46SUPaqgDaz+h+P0e3/lQ2fJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ob/BEOgisFt/BJo3aUIjuGy+2IvXDqI3PLGsvNjxE9a/B9grSmv/bEdNFsip71+vJ B5PPCwPITMB5VboDnjCBSIwXH+AqY1KJklHWo3KbpcdgOwVleGH4buslXwR4y7GrIk HRPBQ9kHwtNOm2PKiTvkIpVJdPBJZ9m5LOxhj/Ds= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vladimir Oltean , Florian Fainelli , Andrew Lunn , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 136/177] net: dsa: fix error code getting shifted with 4 in dsa_slave_get_sset_count Date: Mon, 31 May 2021 15:14:53 +0200 Message-Id: <20210531130652.636646813@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531130647.887605866@linuxfoundation.org> References: <20210531130647.887605866@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vladimir Oltean [ Upstream commit b94cbc909f1d80378a1f541968309e5c1178c98b ] DSA implements a bunch of 'standardized' ethtool statistics counters, namely tx_packets, tx_bytes, rx_packets, rx_bytes. So whatever the hardware driver returns in .get_sset_count(), we need to add 4 to that. That is ok, except that .get_sset_count() can return a negative error code, for example: b53_get_sset_count -> phy_ethtool_get_sset_count -> return -EIO -EIO is -5, and with 4 added to it, it becomes -1, aka -EPERM. One can imagine that certain error codes may even become positive, although based on code inspection I did not see instances of that. Check the error code first, if it is negative return it as-is. Based on a similar patch for dsa_master_get_strings from Dan Carpenter: https://patchwork.kernel.org/project/netdevbpf/patch/YJaSe3RPgn7gKxZv@mwanda/ Fixes: 91da11f870f0 ("net: Distributed Switch Architecture protocol support") Signed-off-by: Vladimir Oltean Reviewed-by: Florian Fainelli Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/dsa/slave.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 06f8874d53ee..75b4cd4bcafb 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -692,13 +692,15 @@ static int dsa_slave_get_sset_count(struct net_device *dev, int sset) struct dsa_switch *ds = dp->ds; if (sset == ETH_SS_STATS) { - int count; + int count = 0; - count = 4; - if (ds->ops->get_sset_count) - count += ds->ops->get_sset_count(ds, dp->index, sset); + if (ds->ops->get_sset_count) { + count = ds->ops->get_sset_count(ds, dp->index, sset); + if (count < 0) + return count; + } - return count; + return count + 4; } return -EOPNOTSUPP; -- 2.30.2