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;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     "David S. Miller" <davem@davemloft.net>,
        Michal Kubecek <mkubecek@suse.cz>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        linux-kernel@vger.kernel.org
Subject: [PATCH net-next 2/2] net: ethtool: mm: sanitize some UAPI configurations
Date:   Sat, 15 Apr 2023 20:34:54 +0300
Message-Id: <20230415173454.3970647-3-vladimir.oltean@nxp.com>
In-Reply-To: <20230415173454.3970647-1-vladimir.oltean@nxp.com>
References: <20230415173454.3970647-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Qw+2zvcqj2vEjfjaYOeGbt3E+omC/1wTdmTeDn+WTnCFXQqsiWUBlAYoQncv?=
 =?us-ascii?Q?bVVrxXoyDznVWCjj7zTe1UTfFMGCaDz14Q+c70hcNGm5G3qsunUJf/MqcBAv?=
 =?us-ascii?Q?v0XBwAc+h4ETfLfQFj0rb1tCn0xiSAkFHYklVQfq1GKkoT4NfCRsQ9dLmx0H?=
 =?us-ascii?Q?FUHQrnII6K+FFZt7dPS6gN6dk81FwYYKV+IeZsY3mPRIcmhWQnKgYaYBH7kr?=
 =?us-ascii?Q?xxR8DXNyDhm2Z3bm19JS7vXhMm+IfAPzs+yJkoMuv33qk9plgj21y1A6tKmO?=
 =?us-ascii?Q?J+HTZ4UKkvKHdwbMpIDpe8XF7F+d0OEpIKavE0xBX8URrVnjwQdZ4N9GxYfH?=
 =?us-ascii?Q?xFA733U5tfu/oD59DxFZjmuEZbZpi9mxvwocNEoZXSjN3OrQcJ8SltRoGOyB?=
 =?us-ascii?Q?ZSrjgLBOuFbBW30ZUblGHxdcN4VjS1QExJx/+y9dV1ZCy4JmbmmsoVqF3kSn?=
 =?us-ascii?Q?0p354UdvQLgtVLCmsCyPxs0fp6ESMx2VeWP9iNWEFu6mfZj0r2L4EJpGmNxg?=
 =?us-ascii?Q?8dMJrbsO0O/VLhuw/jFxBJF1qPp3K0cIyrgKDqhRjDYifNMnBSBmGVeLM54h?=
 =?us-ascii?Q?2rSxr4TphFu6idAGmEOf5AgxFvhk6uDvoccQO5+0CNF7Ypa0bLpqvQe7mlDG?=
 =?us-ascii?Q?fFWhH6iFv0TiFJ2ZN1wSImu3klnDFpS2bYIXsOnWsFDoWGXu1d0DvxEvwAxH?=
 =?us-ascii?Q?O+TovakTLvjT75GucTX2jXI06HXG6ta3H5jLcUuV1y6ZkMAVy+iu1hUpEoeX?=
 =?us-ascii?Q?qC5fmgvl4uxOwWvqmBQtZgHfS2arKughb33Gln8QZgpg9Nv/ddr5GlOenOTU?=
 =?us-ascii?Q?cKpA7gC1AO5Uc1nnT6Z+kAw/eMkSN5qwaAs5sdyf/ve/mJ7HihoDAs9R9V50?=
 =?us-ascii?Q?3sVqTxzLntNR2QQCYeL8IrJ9ES33LaL72xh033NeRwSg2IkT5h07wWouPlM1?=
 =?us-ascii?Q?Fq92UklVDjIHBLKWDBWuoBdohT9zzHet3tP2Kefi/obccYIwCFLCK5+wuCgi?=
 =?us-ascii?Q?EDRDfKcDuMQ41ZkWCb0FaIxd3v6rnrx4B33fzLVi00tXxdJutKRcH/yLpWTy?=
 =?us-ascii?Q?Hojd3B3hDzqWnMx8yuOZGcqPDYgiFeT3pBzFggM1EXa9613LHpc7XDfpEDZh?=
 =?us-ascii?Q?y1HcQrksp4ncu2zUU9LJiF5YKyAY7HYIfhenoj9bdc0TFeoBMcRUDAEJa+1A?=
 =?us-ascii?Q?qlFl4cWEnPdW5X11lRpuBZZ5pa3EvLDTJAh9WsOqutdv5aFJ5b5kOIHANX7C?=
 =?us-ascii?Q?iPMaaCthwWCRxpc4CKGmHG2iYSosw2DlM4a1O7nwAUrjFxgAtqZykgtDhPni?=
 =?us-ascii?Q?6uZoCtlGti2n+oEDTokAmqyi7BgLmtL+k5uS4qYQC56ictCW7ROcpGjZhF8K?=
 =?us-ascii?Q?vM0zF/HGu6bnYJdCw7i9pYmLJv3tgDDES8n/R/Ce9zuuogwZmgALFNOJ41XC?=
 =?us-ascii?Q?FjpmsOJGFNP2pWCcF76CcxRI/Vc/KuDAMU4tEHjIFrYuVARMHXjHt5YhE+zu?=
 =?us-ascii?Q?TnPRJ0s7aCEJ/t9/LsXrgfDiy7ma3HSIjOccH/hbfVCqa/D3el0oKKWkHHZC?=
 =?us-ascii?Q?sufvNVaoLg9Gmd9a3aaYICW/n6+KJZQxEW6O1tkrKcTb28mnlZXGxoIqxVSI?=
 =?us-ascii?Q?1w=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d13484b8-864f-43ed-586a-08db3dd7df3e
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2023 17:35:57.7631
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: NTenl4cxetSBhhhyiDC3M2Kb1mZc6SNXJcV7S3ZtRjtX1dzghiMF9L6toLVcLyfHvRECu4hvIJgx1T8wyNUPkg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8322
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,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The verify-enabled boolean (ETHTOOL_A_MM_VERIFY_ENABLED) was intended to
be a sub-setting of tx-enabled (ETHTOOL_A_MM_TX_ENABLED). IOW, MAC Merge
TX can be enabled with or without verification, but verification with TX
disabled makes no sense.

The pmac-enabled boolean (ETHTOOL_A_MM_PMAC_ENABLED) was intended to be
a global toggle from an API perspective, whereas tx-enabled just handles
the TX direction. IOW, the pMAC can be enabled with or without TX, but
it doesn't make sense to enable TX if the pMAC is not enabled.

Add two checks which sanitize and reject these invalid cases.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 net/ethtool/mm.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/net/ethtool/mm.c b/net/ethtool/mm.c
index e00d7d5cea7e..0eb81231f342 100644
--- a/net/ethtool/mm.c
+++ b/net/ethtool/mm.c
@@ -214,6 +214,11 @@ static int ethnl_set_mm(struct ethnl_req_info *req_info, struct genl_info *info)
 		return -ERANGE;
 	}
 
+	if (cfg.tx_enabled && !cfg.pmac_enabled) {
+		NL_SET_ERR_MSG(extack, "TX enabled requires pMAC enabled");
+		return -EINVAL;
+	}
+
 	ret = dev->ethtool_ops->set_mm(dev, &cfg, extack);
 	return ret < 0 ? ret : 1;
 }
-- 
2.34.1