From patchwork Mon Apr 3 10:34:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 78482 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2201000vqo; Mon, 3 Apr 2023 03:38:40 -0700 (PDT) X-Google-Smtp-Source: AKy350bI3sr/p9M3mkpxzOJK17zB1D3Wxbrk175fMsyb2a8nrd8FiVGbVLWpfm7DnNlekPiPmspN X-Received: by 2002:a17:906:4bcc:b0:93e:24f6:d7a3 with SMTP id x12-20020a1709064bcc00b0093e24f6d7a3mr34777359ejv.8.1680518320490; Mon, 03 Apr 2023 03:38:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1680518320; cv=pass; d=google.com; s=arc-20160816; b=a2fOHoTevFGDEko415ouJFd7elAahnsfNLfyHRkW0fgR7ncaKKKTCSPF5LQ96rCzUj Pts4+vnfA/r7FkrvOxz32JzNz/HjqG4YA2vzO2M1sq8Yz7bLfdzSEXZxc4rGhRMrQicA x70kz+UZo+Nylj1WftrG1KLII6JPF9lRmqpE6X4zVvQFCXA41d1wYu0bWxjd8ATzbkO/ 7D3j9UPsQRa4R6rbLEyY8MXwEbtxZJBERf8g8JQW53xy+94c2yxneoVeHmCYPlYnCSij hxZoMx4ZRnnJ3h/8eXlGGMjKsFu0mbgt4pwNE8p2+zXuDdHGpc4L/hv8xuLIdp1szbb5 L00g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pvzSie3aWoYHN/vBqu+xf4Et325hToTaMuTZofsfdvk=; b=y2CwjxjNMZnBxb1HF50UAMpgI3WnHPyb+KYLg8iErY1GDw8t7VTrACxrndKqkcl0AF YwcHW0ve4wCVi0qFrfcNvkLffJFS8nq+isvFROGew+9KbYx6F716YFxIAyHVsCD/U7oV fB+yeQLjBX5Ki7i/g9rYIlbs2wVkrZanP7iFvgAY7N2YMVNF0K61SfbokC7loEv3C8ic G7U50vBDfNuf2hDQSyPxx7njjbJs+YSGi8VVnLygXXoxsceYIMtYw/Pn79URgIuY/9iX 7/Mu+sUsfkAnf7KG0cobQPk71j0pWctwi93rCXtcbx9FnZPl2HJkyctM0vHqd6b0tjLC VNqg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=Eil0GJ+R; arc=pass (i=1 spf=pass spfdomain=nxp.com dkim=pass dkdomain=nxp.com dmarc=pass fromdomain=nxp.com); 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=nxp.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h6-20020a1709063c0600b008cc211391bdsi4281988ejg.820.2023.04.03.03.38.17; Mon, 03 Apr 2023 03:38:40 -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=@nxp.com header.s=selector2 header.b=Eil0GJ+R; arc=pass (i=1 spf=pass spfdomain=nxp.com dkim=pass dkdomain=nxp.com dmarc=pass fromdomain=nxp.com); 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=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231916AbjDCKfV (ORCPT + 99 others); Mon, 3 Apr 2023 06:35:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231899AbjDCKfE (ORCPT ); Mon, 3 Apr 2023 06:35:04 -0400 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2064.outbound.protection.outlook.com [40.107.105.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40F7030C0; Mon, 3 Apr 2023 03:35:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yf/2dyxkOyn/S+4cG3C87CRMFoPG7Gw8SX/q7javzp6nJ3qMjFiRqQavnbHIIB90gk+XoV06q81zRI6jH/h6ckl+wYzI7gFGfYBweqfZbnc+ccLwsg4qwUZBi5gL4Y7VO7bKkw/TeC2Aq6WKKPrUVs3zFSC57BvMEx2TEiyRiMl4ydiLIv6Hzl4unMk/wLe+BCiD0e+EN1DGLqhLVQTD/AQPQbWrMOnei6tHkzepMxq5lw+tB9HTeuZGOOublSGHwGcKb/vhrHqdNEiUYB44uKHRU0bwiAT41Iajn8JauoyXnX1bbXjqYrZjw16cLBexH/pTIn2GE9mUzEd1HgoTHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pvzSie3aWoYHN/vBqu+xf4Et325hToTaMuTZofsfdvk=; b=Sz92Om1D0C43meAbsLctHrtzUhThL/hN9muBRwS+gdGQID1rmUUv6fC49tlCoOmh3ZwAMFzZgO1Pn6KI74uk5zaTmI2mdlYFkGh0GN3kD0cjpX5btWRDyIaiDuVMYNfnsWXc93YpY9V2epcpxAlTo3ivaXe/eKCcN0jMXr9Egwb5rEGGAPKFUEv18hBK4EkGRe/AQTLW61i2eioCAjKWE4r11Ae3AyKXHN7yMYmPbTunltG9OB2WHzwPd7jZ6fE0sMjgJ7pOJe2sKJqnc+yUe4nNejQGT8gcFE8dJiFEBopWTqc8u4HrSNyaPuWwmT+1rLQl0RclZ+l4iJShe2/saA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pvzSie3aWoYHN/vBqu+xf4Et325hToTaMuTZofsfdvk=; b=Eil0GJ+R9fBly/QxFJpzn5RZ2DrrPtfqHoNKl2RIlwcUvuNlDYv4Q4cXx1e7X+HSJcwCitJUyNPc1LosL2dxM86A1VaAOsBiF9rszzn4JyuqE0fg7TQtNLr+0d0q1JoVGZdWJaNzJfBxQ7GL7pdbd++XlQQzJrnYHISVPwsHYuM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM0PR04MB6452.eurprd04.prod.outlook.com (2603:10a6:208:16d::21) by AS4PR04MB9292.eurprd04.prod.outlook.com (2603:10a6:20b:4e7::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.29; Mon, 3 Apr 2023 10:35:01 +0000 Received: from AM0PR04MB6452.eurprd04.prod.outlook.com ([fe80::dfa2:5d65:fad:a2a5]) by AM0PR04MB6452.eurprd04.prod.outlook.com ([fe80::dfa2:5d65:fad:a2a5%3]) with mapi id 15.20.6254.026; Mon, 3 Apr 2023 10:35:01 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jamal Hadi Salim , Cong Wang , Jiri Pirko , Vinicius Costa Gomes , Kurt Kanzenbach , Gerhard Engleder , Amritha Nambiar , Ferenc Fejes , Xiaoliang Yang , Roger Quadros , Pranavi Somisetty , Harini Katakam , Giuseppe Cavallaro , Alexandre Torgue , Michael Sit Wei Hong , Mohammad Athari Bin Ismail , Oleksij Rempel , Jacob Keller , linux-kernel@vger.kernel.org, Ferenc Fejes , Simon Horman Subject: [PATCH v4 net-next 3/9] net/sched: mqprio: add extack to mqprio_parse_nlattr() Date: Mon, 3 Apr 2023 13:34:34 +0300 Message-Id: <20230403103440.2895683-4-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230403103440.2895683-1-vladimir.oltean@nxp.com> References: <20230403103440.2895683-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: FR0P281CA0221.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ac::17) To AM0PR04MB6452.eurprd04.prod.outlook.com (2603:10a6:208:16d::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB6452:EE_|AS4PR04MB9292:EE_ X-MS-Office365-Filtering-Correlation-Id: 94a5e21a-1a9c-45f9-5de8-08db342f148d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4aEywu5ol0sOeD/ew5WZyJ0Y/9DSfsDB31++3NGGK6xgE/3bF0uOs8dfgcvHjsD08o0Y3ZO+lBTRG9ZxytebVKGiuvb6qQ3Q9EJd0h4iYz9OPQcmivnl0F9x1Gy7ukjVpG8oFFeHBd1TGKC8kUQnpDRBDqcqPU2Jq2pJ9749TQiilYEjqyLgFHxVBrR7HK7pbc+bDJBZDkahs3sF5+ghbUXCxcQk96HtjLrCKIXRBszfNYFNMcl69A04RP3sf62UMVnp6j0tnMw5S0J+cgvsqKHUU5UPCNYH3+QIJ7JOJvW0nCcAa0iBbrpf59OEKwdJUL/mj13+yKGPnqFkfNwikdfs39kd5KzZGw60zOoebh88q1fUPd3Kh+xTc7ApeKCBTbydput9yrRGElwYX9fBH80Keynr/ncCrgv6lJ1Vbhsj3ydhSdnQUg/W86xB9pB2y/5QyDdgr7mFwVznpC3rmiGulXyrtU0v5N9fKktROee5tKAH+NxECtbTZ0DMGI3tRCM4aHofXVhwj8j/C4ILjFtRsUZMcTbTmEWP6m9HqEQX/pTURdavAH6rV8ipyPm/mLmHMpMt3hciyxMoe3Dj2i8Jw0bIrKWwy1EC40jjy5zP9IC1iz9YCDrlmLHzMRL8 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB6452.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(39860400002)(376002)(346002)(366004)(396003)(451199021)(26005)(1076003)(6506007)(186003)(38350700002)(38100700002)(6512007)(86362001)(316002)(54906003)(41300700001)(7416002)(5660300002)(44832011)(66556008)(66476007)(4326008)(66946007)(8676002)(6916009)(478600001)(52116002)(8936002)(6666004)(6486002)(36756003)(2616005)(2906002)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IyQDSRtLsb/0IIj7tOKIF6EC/yG87gNVH5XVXtVXF+He9ZY16v5gZOCC9VbeJzPzyWCDLbJEs9hjOmyOMq1MQGrut+BHvCjeKHmVbZbhuo6YmnOSfEeu+53vFFCDTQcHh9OdmAunk22ftzRM2X8p1lsH9TG2CNri91NgYhzfry6iOUpGFSiTJIOG52ftrlrPveTfwCAg06ZskDyUvB4fmFnJMz8lqpTJWMc+dHL75YGn5dYiuYeXImnF8o0sQNYiyuTIZdVEBl9xWeuh+aRfJmfno68549Aibn5Wx2FJ0HtdKCWlvTR154z1dw0UhHFlO78icPPJCq+tbRGUnZplZ2MJcOnFUyJmAPPP0Yu5aoHyJN4jKhKyDIgPGVmdaiyAtZRAkRIKlf9qLoeEPqWTZnYwpNKBPlE7M2U1g78UCpVZJLxql9WnN8//+bKWXAzeNo5H+WUrFZ2GtW86vut7f97wAsGOsBSZtjEpjB3/zeAtHmWdXztYBmT7GaXO90Y7DwEYWgwvS8ThftV1LWC3e2u3Zf3TnsGJCFMpFpxJaG1T3SpQUd1RXpzNNAZJFDwdtJgxIcxr0lKaT/jZno6BAj/PdeIYODndmDJHfGXt7lpDk3+sM0XIpp2jp7GNg4BKn6L0rU7hjOYDz61t7gzFgcLnqVPBfa7AE34nq+SuyxY7wuwKKE2n+CpRs9XJKX+RaDlk1HGjdE/XQ0zkrTTo9iqJ2roUQ3FJDvlcV3o0pvVvE68MRqXN6RK9rDwfYEJyn9A1ludDa/yNidp7oGnriw4OHInNrT8PG0XmXJujtc1CAFPno/jed/d+NqyKx5brFpswCiyCxRegcmPQb6/XQiF0oqIqPHu0t4MAuTqg47obzMRAoyOxhTcJz3rHgZXlph012aMLjwRJUA9hvVdIDs5tS28PQEClE+WAI/wC6MVuLeaMggoIHHfO22X1/kO50FPfmv/z/OjMPIpLOBpbYxw6G21er97w9nxLFuRH+o1xMBEPOiu5nlrEXlkDWoYDTlayZPpqX/MeLN1qS/fcKhChIbsnVtFJyD4ZZueR0KfmofyD7vNT9VYRWgdQj2cifkZCC4c4kpRDTSBpdRZ7/0PSAV7/NcDhEzKnhFH4lqfS6UnQScngYqkF+exmDOJJSOWEFftMGc673b/+3TPCFZOIJ4BvYs6cuAcoYlTqL3ifE60mA7UH6xCQ03nO/NNg+xjL7VDZpuBHILuUuFJv4tLlzDkgGqmQZlycL0va9ZddAvQfEHqtok2J/gr3DyfTYDOnzc2zIVgZ1GLaZL4hEX6ux4UQeiTH33mgc0U9vh8n5y/5pUdemsZZGml8FzQKUiFhdb1qJimty0AZHRvuBVoxv8w2QwCYa+H5jOvz9Z32VJLzSoGKn4/t8YtV6me3WX6askeP8A3jfe7sJ7c54NP2fdK/ksD8uguXae5av/ZBLV5lD6JbJuDPkVaaw1cARAV61ScGOFaHt4Q8yR2uPg1IYi0q6o17ET7QKcsa6XwBNaG7VEWFdJEKYYozkb2PakNzq4NcCkbEabP+HMsYWB+t5hLsmQBMTrjlgUEabm3e1Tu3BcafwMy9NDKD8Uh2VYa2gU/Hf7f6sD0LNRJgoQ== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94a5e21a-1a9c-45f9-5de8-08db342f148d X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2023 10:35:01.8507 (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: 2TB4azNzzguMTLWmZY322CTnzHWk1kwtcsE767PXfe0lcL2Mx3PtnioNV6132oOweJvA7+obB7Q3TNrSbA1TJA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9292 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_PASS autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762151178142255509?= X-GMAIL-MSGID: =?utf-8?q?1762151178142255509?= Netlink attribute parsing in mqprio is a minesweeper game, with many options having the possibility of being passed incorrectly and the user being none the wiser. Try to make errors less sour by giving user space some information regarding what went wrong. Signed-off-by: Vladimir Oltean Reviewed-by: Ferenc Fejes Reviewed-by: Simon Horman Acked-by: Jamal Hadi Salim --- v1->v4: none net/sched/sch_mqprio.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/net/sched/sch_mqprio.c b/net/sched/sch_mqprio.c index 94093971da5e..5a9261c38b95 100644 --- a/net/sched/sch_mqprio.c +++ b/net/sched/sch_mqprio.c @@ -150,7 +150,8 @@ static const struct nla_policy mqprio_policy[TCA_MQPRIO_MAX + 1] = { * TCA_OPTIONS, which are appended right after struct tc_mqprio_qopt. */ static int mqprio_parse_nlattr(struct Qdisc *sch, struct tc_mqprio_qopt *qopt, - struct nlattr *opt) + struct nlattr *opt, + struct netlink_ext_ack *extack) { struct nlattr *nlattr_opt = nla_data(opt) + NLA_ALIGN(sizeof(*qopt)); int nlattr_opt_len = nla_len(opt) - NLA_ALIGN(sizeof(*qopt)); @@ -167,8 +168,11 @@ static int mqprio_parse_nlattr(struct Qdisc *sch, struct tc_mqprio_qopt *qopt, return err; } - if (!qopt->hw) + if (!qopt->hw) { + NL_SET_ERR_MSG(extack, + "mqprio TCA_OPTIONS can only contain netlink attributes in hardware mode"); return -EINVAL; + } if (tb[TCA_MQPRIO_MODE]) { priv->flags |= TC_MQPRIO_F_MODE; @@ -181,13 +185,19 @@ static int mqprio_parse_nlattr(struct Qdisc *sch, struct tc_mqprio_qopt *qopt, } if (tb[TCA_MQPRIO_MIN_RATE64]) { - if (priv->shaper != TC_MQPRIO_SHAPER_BW_RATE) + if (priv->shaper != TC_MQPRIO_SHAPER_BW_RATE) { + NL_SET_ERR_MSG_ATTR(extack, tb[TCA_MQPRIO_MIN_RATE64], + "min_rate accepted only when shaper is in bw_rlimit mode"); return -EINVAL; + } i = 0; nla_for_each_nested(attr, tb[TCA_MQPRIO_MIN_RATE64], rem) { - if (nla_type(attr) != TCA_MQPRIO_MIN_RATE64) + if (nla_type(attr) != TCA_MQPRIO_MIN_RATE64) { + NL_SET_ERR_MSG_ATTR(extack, attr, + "Attribute type expected to be TCA_MQPRIO_MIN_RATE64"); return -EINVAL; + } if (i >= qopt->num_tc) break; priv->min_rate[i] = *(u64 *)nla_data(attr); @@ -197,13 +207,19 @@ static int mqprio_parse_nlattr(struct Qdisc *sch, struct tc_mqprio_qopt *qopt, } if (tb[TCA_MQPRIO_MAX_RATE64]) { - if (priv->shaper != TC_MQPRIO_SHAPER_BW_RATE) + if (priv->shaper != TC_MQPRIO_SHAPER_BW_RATE) { + NL_SET_ERR_MSG_ATTR(extack, tb[TCA_MQPRIO_MAX_RATE64], + "max_rate accepted only when shaper is in bw_rlimit mode"); return -EINVAL; + } i = 0; nla_for_each_nested(attr, tb[TCA_MQPRIO_MAX_RATE64], rem) { - if (nla_type(attr) != TCA_MQPRIO_MAX_RATE64) + if (nla_type(attr) != TCA_MQPRIO_MAX_RATE64) { + NL_SET_ERR_MSG_ATTR(extack, attr, + "Attribute type expected to be TCA_MQPRIO_MAX_RATE64"); return -EINVAL; + } if (i >= qopt->num_tc) break; priv->max_rate[i] = *(u64 *)nla_data(attr); @@ -252,7 +268,7 @@ static int mqprio_init(struct Qdisc *sch, struct nlattr *opt, len = nla_len(opt) - NLA_ALIGN(sizeof(*qopt)); if (len > 0) { - err = mqprio_parse_nlattr(sch, qopt, opt); + err = mqprio_parse_nlattr(sch, qopt, opt, extack); if (err) return err; }