From patchwork Tue Jul 25 20:56:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 125813 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp19392vqo; Tue, 25 Jul 2023 14:26:24 -0700 (PDT) X-Google-Smtp-Source: APBJJlH5VHm8RTRExp/HgvOxLktq+ejt7Szjuw78BezRpVcg80Eu0Z4jKbo53f5L6ZZ1jWQWwLzv X-Received: by 2002:a05:6a00:1592:b0:668:806d:c2d6 with SMTP id u18-20020a056a00159200b00668806dc2d6mr439823pfk.12.1690320384348; Tue, 25 Jul 2023 14:26:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690320384; cv=none; d=google.com; s=arc-20160816; b=kuOfBaTrnriPo0pnXOXLlgVqPgcA/fPvjLCotIOTJyvAczuhS6KSgx16xmnRgm2PPO etH/OWqUiDNTlqzUjPMClP0Dj5sqafcA0wH1uf+/QfSnWAL6yQfO5+jyXatzpWQLB46e Aia9QY3BQPvJGvixQOuoyQGMW3SZOI6SNl7dpN/ApD/Y+GdlRanQkGirbWn8wyGkDc6P +wBfx5V/g5RaxDbpTYyej6XdPo537eQuoGiF/Dj+2lFzAM//zdLHtXR5h47flVcDOOdS KN7gjp2dJBz3Wl6cgzlKIQ2nQ5r9OMfSBNxg9jPAb9BzMH93dDmfefDx2xr0bx3dgwv4 q0YQ== 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=XXkXZVLYtvpmMK+N6m7lUYctgnQ+ZBph0K+CANbOOz0=; fh=UxPpTnrd/1mYocKAtDnODAIo5SrWyeEXw4UwMVqLA+M=; b=sByLZihJXpNgnxp4UnzXrTWHwO2xmOQAEF7ZM6ZnlMo/4RkNgcCjHLP9XEHNbktkcv ZIBFp16+w5NatewfvFfagjDG8n/OYwso7u0uAMnN3M8YVMe/ivC3o5aNh+Ougt6g2deZ Ts08UAAaPcZuu6SUy13AxZ88Y86PRWm1bb9EnykQTfKAydd1rKYghBCsszYVPD7GqbB3 HlaIuLJRAC27RoOVH/BJPtPkGN3r7pmvlBgkZFvRKNZpT6zq0T434W/T8LAVl9dAK5RS I9nIyMdP6liH15KAcHWon0d28ltf3Pd3S1CkZWTvNX3wRK+RGnYLp9K3CKA31dT3e1Mu FhVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fastly.com header.s=google header.b=hSCX5EM9; 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=REJECT sp=REJECT dis=NONE) header.from=fastly.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f22-20020a056a0022d600b0068626629f4esi12469234pfj.382.2023.07.25.14.26.11; Tue, 25 Jul 2023 14:26:24 -0700 (PDT) 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=@fastly.com header.s=google header.b=hSCX5EM9; 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=REJECT sp=REJECT dis=NONE) header.from=fastly.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231309AbjGYU5Y (ORCPT + 99 others); Tue, 25 Jul 2023 16:57:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229689AbjGYU5V (ORCPT ); Tue, 25 Jul 2023 16:57:21 -0400 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A5C499 for ; Tue, 25 Jul 2023 13:57:20 -0700 (PDT) Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2b701e1ca63so88871421fa.1 for ; Tue, 25 Jul 2023 13:57:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1690318639; x=1690923439; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XXkXZVLYtvpmMK+N6m7lUYctgnQ+ZBph0K+CANbOOz0=; b=hSCX5EM9dinUO3WkWP7I0k1PfipLkOgtZdOvM87v8MFPaxkvNAb+B+8gn5DO4jvKRJ ODRuasphOFkJh3jnCUKQWJXhbWXS01Rm7+psWuaxhlx1yhxan8eWCbk99GFu2hLaC+Gp /ZaJeRc8/8J3FLzolhC3fsvMNEbToGm1gJOXI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690318639; x=1690923439; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XXkXZVLYtvpmMK+N6m7lUYctgnQ+ZBph0K+CANbOOz0=; b=ZWJY1HZx18r+ETkLuFWfaTK0fE7vPNJQ2JQxvtAGZoA9GvePzzYejP5bkMDnrve15Q PjBgT08FbxzNe17Bh7P6OBKxD6XSjq0YbpuBIMqx0h30P8/dqaVsvwWDsJhKgnFaduzX sY4995JwZHkzHEHI7WvQA+kMn+KzIqTA1dYjaM+LegzvzPSHBkHmCcAj1d7NgG7sQfkh LY76QoA1W/gK4srkem0J03GYIP4MC3iFxfWXbMbLK+VnxS3PiWYqoh022vDRyv+VqyOI UnAcyHmJ3LunZ++TIGJ+WFSyUU6mJwzDh9WjbvgHsGSVckx4JbO3N69zPzrSPvvUzgGD wypw== X-Gm-Message-State: ABy/qLbORhJLhTV8obafAqZHRHQLRPfaXAtBnyrPn32cLwLdpru9r+hV wfpbOeg2mayo/142xY6JuQ5mQg== X-Received: by 2002:a2e:9047:0:b0:2b5:974f:385 with SMTP id n7-20020a2e9047000000b002b5974f0385mr9880351ljg.9.1690318638798; Tue, 25 Jul 2023 13:57:18 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id h19-20020a1709062dd300b0097073f1ed84sm8704186eji.4.2023.07.25.13.57.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 13:57:18 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org, saeedm@nvidia.com, tariqt@nvidia.com, ecree@solarflare.com, andrew@lunn.ch, kuba@kernel.org, davem@davemloft.net, leon@kernel.org, pabeni@redhat.com, arnd@arndb.de Cc: linux-kernel@vger.kernel.org, Joe Damato , Edward Cree Subject: [net-next v2 1/2] net: ethtool: Unify ETHTOOL_{G,S}RXFH rxnfc copy Date: Tue, 25 Jul 2023 20:56:54 +0000 Message-Id: <20230725205655.310165-2-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230725205655.310165-1-jdamato@fastly.com> References: <20230725205655.310165-1-jdamato@fastly.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772429387205337748 X-GMAIL-MSGID: 1772429387205337748 ETHTOOL_GRXFH correctly copies in the full struct ethtool_rxnfc when FLOW_RSS is set; ETHTOOL_SRXFH needs a similar code path to handle the FLOW_RSS case so that ethtool can set the flow hash for custom RSS contexts (if supported by the driver). The copy code from ETHTOOL_GRXFH has been pulled out in to a helper so that it can be called in both ETHTOOL_{G,S}RXFH code paths. Acked-by: Edward Cree Signed-off-by: Joe Damato --- net/ethtool/ioctl.c | 75 +++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 4a51e0ec295c..7d40e7913e76 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -907,6 +907,38 @@ static int ethtool_rxnfc_copy_to_compat(void __user *useraddr, return 0; } +static int ethtool_rxnfc_copy_struct(u32 cmd, struct ethtool_rxnfc *info, + size_t *info_size, void __user *useraddr) +{ + /* struct ethtool_rxnfc was originally defined for + * ETHTOOL_{G,S}RXFH with only the cmd, flow_type and data + * members. User-space might still be using that + * definition. + */ + if (cmd == ETHTOOL_GRXFH || cmd == ETHTOOL_SRXFH) + *info_size = (offsetof(struct ethtool_rxnfc, data) + + sizeof(info->data)); + + if (ethtool_rxnfc_copy_from_user(info, useraddr, *info_size)) + return -EFAULT; + + if ((cmd == ETHTOOL_GRXFH || cmd == ETHTOOL_SRXFH) && info->flow_type & FLOW_RSS) { + *info_size = sizeof(*info); + if (ethtool_rxnfc_copy_from_user(info, useraddr, *info_size)) + return -EFAULT; + /* Since malicious users may modify the original data, + * we need to check whether FLOW_RSS is still requested. + */ + if (!(info->flow_type & FLOW_RSS)) + return -EINVAL; + } + + if (info->cmd != cmd) + return -EINVAL; + + return 0; +} + static int ethtool_rxnfc_copy_to_user(void __user *useraddr, const struct ethtool_rxnfc *rxnfc, size_t size, const u32 *rule_buf) @@ -944,16 +976,9 @@ static noinline_for_stack int ethtool_set_rxnfc(struct net_device *dev, if (!dev->ethtool_ops->set_rxnfc) return -EOPNOTSUPP; - /* struct ethtool_rxnfc was originally defined for - * ETHTOOL_{G,S}RXFH with only the cmd, flow_type and data - * members. User-space might still be using that - * definition. */ - if (cmd == ETHTOOL_SRXFH) - info_size = (offsetof(struct ethtool_rxnfc, data) + - sizeof(info.data)); - - if (ethtool_rxnfc_copy_from_user(&info, useraddr, info_size)) - return -EFAULT; + rc = ethtool_rxnfc_copy_struct(cmd, &info, &info_size, useraddr); + if (rc) + return rc; rc = dev->ethtool_ops->set_rxnfc(dev, &info); if (rc) @@ -978,33 +1003,9 @@ static noinline_for_stack int ethtool_get_rxnfc(struct net_device *dev, if (!ops->get_rxnfc) return -EOPNOTSUPP; - /* struct ethtool_rxnfc was originally defined for - * ETHTOOL_{G,S}RXFH with only the cmd, flow_type and data - * members. User-space might still be using that - * definition. */ - if (cmd == ETHTOOL_GRXFH) - info_size = (offsetof(struct ethtool_rxnfc, data) + - sizeof(info.data)); - - if (ethtool_rxnfc_copy_from_user(&info, useraddr, info_size)) - return -EFAULT; - - /* If FLOW_RSS was requested then user-space must be using the - * new definition, as FLOW_RSS is newer. - */ - if (cmd == ETHTOOL_GRXFH && info.flow_type & FLOW_RSS) { - info_size = sizeof(info); - if (ethtool_rxnfc_copy_from_user(&info, useraddr, info_size)) - return -EFAULT; - /* Since malicious users may modify the original data, - * we need to check whether FLOW_RSS is still requested. - */ - if (!(info.flow_type & FLOW_RSS)) - return -EINVAL; - } - - if (info.cmd != cmd) - return -EINVAL; + ret = ethtool_rxnfc_copy_struct(cmd, &info, &info_size, useraddr); + if (ret) + return ret; if (info.cmd == ETHTOOL_GRXCLSRLALL) { if (info.rule_cnt > 0) {