Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp1746298rwl; Mon, 26 Dec 2022 04:15:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXvW5lNt8IaAE6kBjMb9ucuxVPZp+QWyrHHjN1RlLbX9cKgNlF1NQ2hc4d5ByC9nugxI+QsZ X-Received: by 2002:a17:902:ec82:b0:187:2f28:bfd6 with SMTP id x2-20020a170902ec8200b001872f28bfd6mr30477374plg.21.1672056943855; Mon, 26 Dec 2022 04:15:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672056943; cv=none; d=google.com; s=arc-20160816; b=cT0Xael1mJCDK6GfgU6/cA6ydhlu5brOhHVuUIaVvWl+2SXw+gMFCC8yEeWV0aHNjh vZ04iC0jG7GLvLp9TkdvC2tX8csshh6wSAEBH26sQ3P8RHqsDptKux/m2w2Sp3qUE8V2 /BEgFUEcwlwlCrJrEUDuS6dKScH3WWhvvH9QkQtbwDLS2WpFlqRZKl4n56t+3bMk4mxJ fpBVCLjnZV4nKai5f5ntLQ8qdW/DaKRCj5uYcN4Tfl2XH4Ys+wvuKPga3ULkdQFKmJmd RYrCydlhfexa+6U9kw5UEN4RMjS6hzz+Z58IpkbkfSC9iiUC/Z0NG2YvKEVvK6u/9LSX UrHA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Wl46n9GzEekweDAs/Z8zerV+l+QIWCUnBlczJiEGt0c=; b=NCJiXGXC6bIl4EfwXBcByl0y3nCsHtkNG2W/n3l9Yt9yf5gXKmpzZOqar7TOd2wAtV HjOqtkBkrD20Af9M+HY5cKCu73XnoPA5SWM9Pntm8sAJ1qBRWHB7Jk+kj3eNzHSmeIUv pneBqvByQYPW7vwWFHk4dc2Hcg8Dhmwm94GEdf+msD68gcGspzvWQKoHRcMiCIMalAGG FCwtjrwOuM5FRPUdWgrbl3M2cmIr0HuaKX4p5XFKbx4R58koLN3oe06OY0iGaDBrQOUn v5m/FNkFQNUJMrt3/7chlKJbJ/nVOLfKUDtqeDZKj0uYsOxz/ykPiCqzPCqpS0n1gfaX EknA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@yandex-team.ru header.s=default header.b=q0UggCoP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=yandex-team.ru Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g8-20020a170902934800b00189847745f1si10371373plp.395.2022.12.26.04.15.35; Mon, 26 Dec 2022 04:15:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@yandex-team.ru header.s=default header.b=q0UggCoP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=yandex-team.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231585AbiLZLso (ORCPT + 66 others); Mon, 26 Dec 2022 06:48:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229450AbiLZLsn (ORCPT ); Mon, 26 Dec 2022 06:48:43 -0500 Received: from forwardcorp1a.mail.yandex.net (forwardcorp1a.mail.yandex.net [178.154.239.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93A3D2FB; Mon, 26 Dec 2022 03:48:42 -0800 (PST) Received: from vla1-81430ab5870b.qloud-c.yandex.net (vla1-81430ab5870b.qloud-c.yandex.net [IPv6:2a02:6b8:c0d:35a1:0:640:8143:ab5]) by forwardcorp1a.mail.yandex.net (Yandex) with ESMTP id CEFD85FCE7; Mon, 26 Dec 2022 14:48:40 +0300 (MSK) Received: from d-tatianin-nix.yandex-team.ru (unknown [2a02:6b8:b081:1::1:f]) by vla1-81430ab5870b.qloud-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id SmMqpV0Q0uQ1-IbutsOwc; Mon, 26 Dec 2022 14:48:40 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1672055320; bh=Wl46n9GzEekweDAs/Z8zerV+l+QIWCUnBlczJiEGt0c=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=q0UggCoPnCZNu0GuMmnwmxZbLUamlM5m0fItS/NudL461zYOxkjVZNcZKAWq2o0qs Xle0rtoLgw3/FbSBJfmjoWfGUOfmnanmGbllRKf5m5E98WOn7E47L7RCIZLanO5lon MU8y+Yp6UgZbTIDelR6lxq2J/kHiUFhW1xydSGQs= Authentication-Results: vla1-81430ab5870b.qloud-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Daniil Tatianin To: "David S. Miller" Cc: Daniil Tatianin , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , Sean Anderson , Jiri Pirko , Wolfram Sang , Maxim Korotkov , Gal Pressman , Vincent Mailhol , Tom Rix , Marco Bonelli , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net v2 1/3] net/ethtool/ioctl: return -EOPNOTSUPP if we have no phy stats Date: Mon, 26 Dec 2022 14:48:23 +0300 Message-Id: <20221226114825.1937189-2-d-tatianin@yandex-team.ru> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221226114825.1937189-1-d-tatianin@yandex-team.ru> References: <20221226114825.1937189-1-d-tatianin@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- net/ethtool/ioctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 57e7238a4136..e8a294b38b7b 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -2093,7 +2093,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.25.1