From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 026C6C25B4E for ; Sun, 22 Jan 2023 15:06:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230157AbjAVPGZ (ORCPT ); Sun, 22 Jan 2023 10:06:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230156AbjAVPGX (ORCPT ); Sun, 22 Jan 2023 10:06:23 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAA38126C7 for ; Sun, 22 Jan 2023 07:06:22 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6C7EDB80B12 for ; Sun, 22 Jan 2023 15:06:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C50B1C433D2; Sun, 22 Jan 2023 15:06:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1674399980; bh=Bumd19miQhmlSSUwBCsauULuzRX1ychle5y01WQHEGk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZDEAAyh1bkZKrixdRUJdGPKxeVpYJgSefT6emttsjL+SI1rA7dtQyvQzBBpUSfeYQ y60YOzRKx4jhfU8Q/C2geE14eppZv4hfO0sZKQljuMXXAQDjM73qWw5642SuPOpOJz 57ZJwQlhdx0TdgZO2dT9oOYuKWYtj18jYAsLnrHA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Daniil Tatianin , Andrew Lunn , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 02/25] net/ethtool/ioctl: return -EOPNOTSUPP if we have no phy stats Date: Sun, 22 Jan 2023 16:04:02 +0100 Message-Id: <20230122150217.902413367@linuxfoundation.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230122150217.788215473@linuxfoundation.org> References: <20230122150217.788215473@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Daniil Tatianin [ Upstream commit 9deb1e9fb88b1120a908676fa33bdf9e2eeaefce ] It's not very useful to copy back an empty ethtool_stats struct and return 0 if we didn't actually have any stats. This also allows for further simplification of this function in the future commits. Signed-off-by: Daniil Tatianin Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/core/ethtool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 749d48393d06..fe2217e339dc 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -1969,7 +1969,8 @@ static int ethtool_get_phy_stats(struct net_device *dev, void __user *useraddr) return n_stats; if (n_stats > S32_MAX / sizeof(u64)) return -ENOMEM; - WARN_ON_ONCE(!n_stats); + if (WARN_ON_ONCE(!n_stats)) + return -EOPNOTSUPP; if (copy_from_user(&stats, useraddr, sizeof(stats))) return -EFAULT; -- 2.35.1