From nobody Tue Dec 23 18:03:45 2025 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F184782868 for ; Wed, 31 Jan 2024 17:00:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706720434; cv=none; b=TTOkU0thtBnA64rG2EaY/3nwTzbxotblpSIf+GxUKHcr7J9xIgDMfCzAfrT0lg7JWjsT9yn+8fS21CiE0rRMO58KnzSoFMAHnC8wl+kPE6+qxFsBSo6LA+1p84m6Sq49vRV8Di+f2aCzhN6d7OvmVI7IuumCNxBXbU08tGObseg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706720434; c=relaxed/simple; bh=7ZI5OiUN/ZoXvxWDcRvjx22ns4EuR9iHRYQgmrHB4IM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=hzV3MmhkgN7J+cMNM+NuVHaBlf3lw1+/XoC2L+6REo/KgVDONEQIrUidNgvxxAtvLXXeyY6UTMRiL2lXsUFoXp8ZziHK96rqvR1Jkkk3DdHum8kjl4suqnfF1eCx1i6pTdrTr8FlyimXzgF0aya9V+Q0MkN8BnbFO0ju5qJ2pSk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=networkplumber.org; spf=pass smtp.mailfrom=networkplumber.org; dkim=pass (2048-bit key) header.d=networkplumber-org.20230601.gappssmtp.com header.i=@networkplumber-org.20230601.gappssmtp.com header.b=h0RjWr9d; arc=none smtp.client-ip=209.85.215.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=networkplumber.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=networkplumber.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=networkplumber-org.20230601.gappssmtp.com header.i=@networkplumber-org.20230601.gappssmtp.com header.b="h0RjWr9d" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-5d8bc1caf00so3361a12.1 for ; Wed, 31 Jan 2024 09:00:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1706720431; x=1707325231; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=orIE+m+kaBV/H9IsTBMWBHTEFbu8zhGx2d0kSUXoqu8=; b=h0RjWr9dfjhZuFdKDJNz25gdTlzgCt80nTM+Bi9j3G07C8e6I9j6IeyhXjvohESYq8 YB6WND2FcdpvPzrKDZsGHjk69VHDJlqT6Dnkp8uSfIUZYw4accilgQOpGr/Ub7Wdq7vy MUD5G7FRrjx8VQYdTsSA7vffqBR03gyNZQ5xOzcXqMnGxAr8x6FOBVpBDE4wPqsA+OuJ 9bSMuh1QZS/km463mMLsjs/j/VB3mdfIfwRhD3BpDvKlDqiTs/77xjQ1ScYVwAWfcK5O EbCrKc4blaEEb3/bnJ8RgWAOL8ITcWih0AiqJmW77CY7S7tn97bYTrohEKCzodOqDKcY 470g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706720431; x=1707325231; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=orIE+m+kaBV/H9IsTBMWBHTEFbu8zhGx2d0kSUXoqu8=; b=OHvjhYKPWoC/eEFB65053BN1aSaZNsEe9ZK/K7k4aMJiHB/HD2MdbmDWoVHfk1yZxF jHbJGkOE7+VBja305quwrgktXyo0pKbQtR7ZpXehvst0C4jcLrsl+Vas/7sWcxUSWB99 3KfUyLqIQAA4mluOMnVNOK9IRatgPiEGxsLozXVSUftwlYiUn0su6nMTME4sPkCsIHl3 MM3FnSoGedB1FGqX5yNum20zzjD8fpAvw/wP3ixbReng8SoJwCgRqj+aXMf8HraXix6K Zqr650XaAseq1Os04p3QUWd1ZEjNzYBSTnG9QKOHwGK2yyNtpJDQ7UaaDPrXHTMx/6QP VMLg== X-Gm-Message-State: AOJu0Ywqy6KDfFZjX34vSmkIuSt40lZ04V++5k0EbOjKvszwcT9LtcPu jdp+aI2Q5FEiUjbVEoDRPOGgAAZUhMpqzockwuW9Xsqn2lwBV5pwmKkobnTQdPg= X-Google-Smtp-Source: AGHT+IGzlghiahCuiO2Gb18iwEaxiSN5NOIaXDisOmM+Oy6bEyyY3V6lzdiLI2cVqp77/xikhcgvjA== X-Received: by 2002:a05:6a20:d90d:b0:19c:a0f0:b0ea with SMTP id jd13-20020a056a20d90d00b0019ca0f0b0eamr2345044pzb.19.1706720431221; Wed, 31 Jan 2024 09:00:31 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCV3WHrZvGNEERtCOZWRcc7t5hlO9itp98eVqBq0GHz4idVx198YdS//u3gZ0RNU7cTnI3yGXSAWwmf1i0Fge1eB+VS2PMyQthjS8pk2a+F/y2DYfjiarZL8nmVxdV1hKMaYGtW7cat7c3ROMR/Z2o9zQ410XMUBgqFV9Uj6Ab22RLklLHO/BtC80o7l6mIYhQz3GXM8b4GFWfK8cA/Z8oWzKynInT5DlrkkoW16L0z778Na9RSlDZDfZMOQybORv8eIdKSzhftclPG+Abelc7mRDbZ+IB/93W+UFaM27jA9I8G73MEEJcb4HAzrdwPutVRuRs6p/g6hrsxPBLfzEQ38FRXWaOHOcIE6PY8yra3XvpdpWXq80E0Q3jBsw61mGr0zj43qvPNuyblIPibLP4OGr3bc2J1v4sIu8JC1ot6Of4Jhc7tYgMNoSJC5y/msPy9xBOHexYy+rYv7mXsZCoCxiuGfEyZTiLxpQDNJPngGJpkErwas1ro0TRzxl6sPa6xHz4Wp4kRgmKtPj8t6b/ho72R7MboJNl1ZdmanDnWVTQeEwq9ua2Wn554Jcw347YslvJMpL/DzBKpFpCOnUt2xDnn94EG9W3MdZXAg5JyUQgTaaE+az+WV051AYA== Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id gu2-20020a056a004e4200b006dde1781800sm10447537pfb.94.2024.01.31.09.00.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 09:00:30 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger , Martin KaFai Lau , Daniel Borkmann , John Fastabend , Alexei Starovoitov , Andrii Nakryiko , Eduard Zingerman , Song Liu , Yonghong Song , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Jamal Hadi Salim , Cong Wang , Jiri Pirko , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , bpf@vger.kernel.org (open list:BPF [NETWORKING] (tcx & tc BPF, sock_addr)), linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next] net/sched: report errors with extack Date: Wed, 31 Jan 2024 08:58:06 -0800 Message-ID: <20240131170019.106122-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" While working a BPF action, found that the error handling was limited. The support of external ack was only added to some but not all actions.=20 When an action detects invalid parameters, it should be adding an external ack to netlink so that the user is able to diagnose the issue. Signed-off-by: Stephen Hemminger --- net/sched/act_bpf.c | 31 ++++++++++++++++++++++--------- net/sched/act_connmark.c | 8 ++++++-- net/sched/act_csum.c | 8 ++++++-- net/sched/act_gact.c | 14 +++++++++++--- net/sched/act_gate.c | 15 +++++++++++---- net/sched/act_ife.c | 8 ++++++-- net/sched/act_nat.c | 9 +++++++-- net/sched/act_police.c | 13 ++++++++++--- net/sched/act_sample.c | 8 ++++++-- net/sched/act_simple.c | 9 +++++++-- net/sched/act_skbedit.c | 13 ++++++++++--- net/sched/act_skbmod.c | 9 +++++++-- net/sched/act_vlan.c | 8 ++++++-- 13 files changed, 115 insertions(+), 38 deletions(-) diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c index 6cfee6658103..f8a03d3bbf20 100644 --- a/net/sched/act_bpf.c +++ b/net/sched/act_bpf.c @@ -184,7 +184,8 @@ static const struct nla_policy act_bpf_policy[TCA_ACT_B= PF_MAX + 1] =3D { .len =3D sizeof(struct sock_filter) * BPF_MAXINSNS }, }; =20 -static int tcf_bpf_init_from_ops(struct nlattr **tb, struct tcf_bpf_cfg *c= fg) +static int tcf_bpf_init_from_ops(struct nlattr **tb, struct tcf_bpf_cfg *c= fg, + struct netlink_ext_ack *extack) { struct sock_filter *bpf_ops; struct sock_fprog_kern fprog_tmp; @@ -193,12 +194,16 @@ static int tcf_bpf_init_from_ops(struct nlattr **tb, = struct tcf_bpf_cfg *cfg) int ret; =20 bpf_num_ops =3D nla_get_u16(tb[TCA_ACT_BPF_OPS_LEN]); - if (bpf_num_ops > BPF_MAXINSNS || bpf_num_ops =3D=3D 0) + if (bpf_num_ops > BPF_MAXINSNS || bpf_num_ops =3D=3D 0) { + NL_SET_ERR_MSG_MOD(extack, "Invalid number of BPF instructions"); return -EINVAL; + } =20 bpf_size =3D bpf_num_ops * sizeof(*bpf_ops); - if (bpf_size !=3D nla_len(tb[TCA_ACT_BPF_OPS])) + if (bpf_size !=3D nla_len(tb[TCA_ACT_BPF_OPS])) { + NL_SET_ERR_MSG_MOD(extack, "BPF instruction size"); return -EINVAL; + } =20 bpf_ops =3D kmemdup(nla_data(tb[TCA_ACT_BPF_OPS]), bpf_size, GFP_KERNEL); if (bpf_ops =3D=3D NULL) @@ -221,7 +226,8 @@ static int tcf_bpf_init_from_ops(struct nlattr **tb, st= ruct tcf_bpf_cfg *cfg) return 0; } =20 -static int tcf_bpf_init_from_efd(struct nlattr **tb, struct tcf_bpf_cfg *c= fg) +static int tcf_bpf_init_from_efd(struct nlattr **tb, struct tcf_bpf_cfg *c= fg, + struct netlink_ext_ack *extack) { struct bpf_prog *fp; char *name =3D NULL; @@ -230,8 +236,10 @@ static int tcf_bpf_init_from_efd(struct nlattr **tb, s= truct tcf_bpf_cfg *cfg) bpf_fd =3D nla_get_u32(tb[TCA_ACT_BPF_FD]); =20 fp =3D bpf_prog_get_type(bpf_fd, BPF_PROG_TYPE_SCHED_ACT); - if (IS_ERR(fp)) + if (IS_ERR(fp)) { + NL_SET_ERR_MSG_MOD(extack, "BPF program type mismatch"); return PTR_ERR(fp); + } =20 if (tb[TCA_ACT_BPF_NAME]) { name =3D nla_memdup(tb[TCA_ACT_BPF_NAME], GFP_KERNEL); @@ -292,16 +300,20 @@ static int tcf_bpf_init(struct net *net, struct nlatt= r *nla, int ret, res =3D 0; u32 index; =20 - if (!nla) + if (!nla) { + NL_SET_ERR_MSG_MOD(extack, "Bpf requires attributes to be passed"); return -EINVAL; + } =20 ret =3D nla_parse_nested_deprecated(tb, TCA_ACT_BPF_MAX, nla, act_bpf_policy, NULL); if (ret < 0) return ret; =20 - if (!tb[TCA_ACT_BPF_PARMS]) + if (!tb[TCA_ACT_BPF_PARMS]) { + NL_SET_ERR_MSG_MOD(extack, "Missing required bpf parameters"); return -EINVAL; + } =20 parm =3D nla_data(tb[TCA_ACT_BPF_PARMS]); index =3D parm->index; @@ -336,14 +348,15 @@ static int tcf_bpf_init(struct net *net, struct nlatt= r *nla, is_ebpf =3D tb[TCA_ACT_BPF_FD]; =20 if (is_bpf =3D=3D is_ebpf) { + NL_SET_ERR_MSG_MOD(extack, "Can not specify both BPF fd and ops"); ret =3D -EINVAL; goto put_chain; } =20 memset(&cfg, 0, sizeof(cfg)); =20 - ret =3D is_bpf ? tcf_bpf_init_from_ops(tb, &cfg) : - tcf_bpf_init_from_efd(tb, &cfg); + ret =3D is_bpf ? tcf_bpf_init_from_ops(tb, &cfg, extack) : + tcf_bpf_init_from_efd(tb, &cfg, extack); if (ret < 0) goto put_chain; =20 diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c index f8762756657d..0964d10dfc04 100644 --- a/net/sched/act_connmark.c +++ b/net/sched/act_connmark.c @@ -110,16 +110,20 @@ static int tcf_connmark_init(struct net *net, struct = nlattr *nla, int ret =3D 0, err; u32 index; =20 - if (!nla) + if (!nla) { + NL_SET_ERR_MSG_MOD(extack, "Connmark requires attributes to be passed"); return -EINVAL; + } =20 ret =3D nla_parse_nested_deprecated(tb, TCA_CONNMARK_MAX, nla, connmark_policy, NULL); if (ret < 0) return ret; =20 - if (!tb[TCA_CONNMARK_PARMS]) + if (!tb[TCA_CONNMARK_PARMS]) { + NL_SET_ERR_MSG(extack, "Missing required connmark parameters"); return -EINVAL; + } =20 nparms =3D kzalloc(sizeof(*nparms), GFP_KERNEL); if (!nparms) diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c index 7f8b1f2f2ed9..7c7f74e37528 100644 --- a/net/sched/act_csum.c +++ b/net/sched/act_csum.c @@ -55,16 +55,20 @@ static int tcf_csum_init(struct net *net, struct nlattr= *nla, int ret =3D 0, err; u32 index; =20 - if (nla =3D=3D NULL) + if (!nla) { + NL_SET_ERR_MSG_MOD(extack, "Checksum requires attributes to be passed"); return -EINVAL; + } =20 err =3D nla_parse_nested_deprecated(tb, TCA_CSUM_MAX, nla, csum_policy, NULL); if (err < 0) return err; =20 - if (tb[TCA_CSUM_PARMS] =3D=3D NULL) + if (!tb[TCA_CSUM_PARMS]) { + NL_SET_ERR_MSG(extack, "Missing required checksum parameters"); return -EINVAL; + } parm =3D nla_data(tb[TCA_CSUM_PARMS]); index =3D parm->index; err =3D tcf_idr_check_alloc(tn, &index, a, bind); diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c index 4af3b7ec249f..5d04bcd5115e 100644 --- a/net/sched/act_gact.c +++ b/net/sched/act_gact.c @@ -68,16 +68,21 @@ static int tcf_gact_init(struct net *net, struct nlattr= *nla, struct tc_gact_p *p_parm =3D NULL; #endif =20 - if (nla =3D=3D NULL) + if (!nla) { + NL_SET_ERR_MSG(extack, "Gact requires attributes to be passed"); return -EINVAL; + } =20 err =3D nla_parse_nested_deprecated(tb, TCA_GACT_MAX, nla, gact_policy, NULL); if (err < 0) return err; =20 - if (tb[TCA_GACT_PARMS] =3D=3D NULL) + if (!tb[TCA_GACT_PARMS]) { + NL_SET_ERR_MSG_MOD(extack, "Missing required gact parameters"); return -EINVAL; + } + parm =3D nla_data(tb[TCA_GACT_PARMS]); index =3D parm->index; =20 @@ -87,8 +92,11 @@ static int tcf_gact_init(struct net *net, struct nlattr = *nla, #else if (tb[TCA_GACT_PROB]) { p_parm =3D nla_data(tb[TCA_GACT_PROB]); - if (p_parm->ptype >=3D MAX_RAND) + if (p_parm->ptype >=3D MAX_RAND) { + NL_SET_ERR_MSG(extack, "Invalid ptype in gact prob"); return -EINVAL; + } + if (TC_ACT_EXT_CMP(p_parm->paction, TC_ACT_GOTO_CHAIN)) { NL_SET_ERR_MSG(extack, "goto chain not allowed on fallback"); diff --git a/net/sched/act_gate.c b/net/sched/act_gate.c index c681cd011afd..c9e32822938c 100644 --- a/net/sched/act_gate.c +++ b/net/sched/act_gate.c @@ -239,8 +239,10 @@ static int parse_gate_list(struct nlattr *list_attr, int err, rem; int i =3D 0; =20 - if (!list_attr) + if (!list_attr) { + NL_SET_ERR_MSG(extack, "Gate missing attributes"); return -EINVAL; + } =20 nla_for_each_nested(n, list_attr, rem) { if (nla_type(n) !=3D TCA_GATE_ONE_ENTRY) { @@ -317,15 +319,19 @@ static int tcf_gate_init(struct net *net, struct nlat= tr *nla, ktime_t start; u32 index; =20 - if (!nla) + if (!nla) { + NL_SET_ERR_MSG_MOD(extack, "Gate requires attributes to be passed"); return -EINVAL; + } =20 err =3D nla_parse_nested(tb, TCA_GATE_MAX, nla, gate_policy, extack); if (err < 0) return err; =20 - if (!tb[TCA_GATE_PARMS]) + if (!tb[TCA_GATE_PARMS]) { + NL_SET_ERR_MSG_MOD(extack, "Missing required gate parameters"); return -EINVAL; + } =20 if (tb[TCA_GATE_CLOCKID]) { clockid =3D nla_get_s32(tb[TCA_GATE_CLOCKID]); @@ -343,7 +349,7 @@ static int tcf_gate_init(struct net *net, struct nlattr= *nla, tk_offset =3D TK_OFFS_TAI; break; default: - NL_SET_ERR_MSG(extack, "Invalid 'clockid'"); + NL_SET_ERR_MSG_MOD(extack, "Invalid 'clockid'"); return -EINVAL; } } @@ -409,6 +415,7 @@ static int tcf_gate_init(struct net *net, struct nlattr= *nla, cycle =3D ktime_add_ns(cycle, entry->interval); cycletime =3D cycle; if (!cycletime) { + NL_SET_ERR_MSG_MOD(extack, "cycle time is zero"); err =3D -EINVAL; goto chain_put; } diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c index 0e867d13beb5..85a58cfb23f3 100644 --- a/net/sched/act_ife.c +++ b/net/sched/act_ife.c @@ -508,8 +508,10 @@ static int tcf_ife_init(struct net *net, struct nlattr= *nla, if (err < 0) return err; =20 - if (!tb[TCA_IFE_PARMS]) + if (!tb[TCA_IFE_PARMS]) { + NL_SET_ERR_MSG_MOD(extack, "Missing required ife parameters"); return -EINVAL; + } =20 parm =3D nla_data(tb[TCA_IFE_PARMS]); =20 @@ -517,8 +519,10 @@ static int tcf_ife_init(struct net *net, struct nlattr= *nla, * they cannot run as the same time. Check on all other values which * are not supported right now. */ - if (parm->flags & ~IFE_ENCODE) + if (parm->flags & ~IFE_ENCODE) { + NL_SET_ERR_MSG_MOD(extack, "Invalid ife flag parameter"); return -EINVAL; + } =20 p =3D kzalloc(sizeof(*p), GFP_KERNEL); if (!p) diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c index a180e724634e..a990d0c626cd 100644 --- a/net/sched/act_nat.c +++ b/net/sched/act_nat.c @@ -46,16 +46,21 @@ static int tcf_nat_init(struct net *net, struct nlattr = *nla, struct nlattr *est, struct tcf_nat *p; u32 index; =20 - if (nla =3D=3D NULL) + if (!nla) { + NL_SET_ERR_MSG_MOD(extack, "Nat action requires attributes"); return -EINVAL; + } =20 err =3D nla_parse_nested_deprecated(tb, TCA_NAT_MAX, nla, nat_policy, NULL); if (err < 0) return err; =20 - if (tb[TCA_NAT_PARMS] =3D=3D NULL) + if (!tb[TCA_NAT_PARMS]) { + NL_SET_ERR_MSG_MOD(extack, "Nat action parameters missing"); return -EINVAL; + } + parm =3D nla_data(tb[TCA_NAT_PARMS]); index =3D parm->index; err =3D tcf_idr_check_alloc(tn, &index, a, bind); diff --git a/net/sched/act_police.c b/net/sched/act_police.c index e119b4a3db9f..3eb41233257b 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c @@ -56,19 +56,26 @@ static int tcf_police_init(struct net *net, struct nlat= tr *nla, u64 rate64, prate64; u64 pps, ppsburst; =20 - if (nla =3D=3D NULL) + if (!nla) { + NL_SET_ERR_MSG_MOD(extack, "Police requires attributes"); return -EINVAL; + } =20 err =3D nla_parse_nested_deprecated(tb, TCA_POLICE_MAX, nla, police_policy, NULL); if (err < 0) return err; =20 - if (tb[TCA_POLICE_TBF] =3D=3D NULL) + if (!tb[TCA_POLICE_TBF]) { + NL_SET_ERR_MSG_MOD(extack, "Missing required police action parameters"); return -EINVAL; + } + size =3D nla_len(tb[TCA_POLICE_TBF]); - if (size !=3D sizeof(*parm) && size !=3D sizeof(struct tc_police_compat)) + if (size !=3D sizeof(*parm) && size !=3D sizeof(struct tc_police_compat))= { + NL_SET_ERR_MSG_MOD(extack, "Invalid size for police action parameters"); return -EINVAL; + } =20 parm =3D nla_data(tb[TCA_POLICE_TBF]); index =3D parm->index; diff --git a/net/sched/act_sample.c b/net/sched/act_sample.c index c5c61efe6db4..2442e001d92e 100644 --- a/net/sched/act_sample.c +++ b/net/sched/act_sample.c @@ -49,15 +49,19 @@ static int tcf_sample_init(struct net *net, struct nlat= tr *nla, bool exists =3D false; int ret, err; =20 - if (!nla) + if (!nla) { + NL_SET_ERR_MSG_MOD(extack, "Sample requires attributes to be passed"); return -EINVAL; + } ret =3D nla_parse_nested_deprecated(tb, TCA_SAMPLE_MAX, nla, sample_policy, NULL); if (ret < 0) return ret; =20 - if (!tb[TCA_SAMPLE_PARMS]) + if (!tb[TCA_SAMPLE_PARMS]) { + NL_SET_ERR_MSG_MOD(extack, "Missing required sample action parameters"); return -EINVAL; + } =20 parm =3D nla_data(tb[TCA_SAMPLE_PARMS]); index =3D parm->index; diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c index 0a3e92888295..02b8e42c1bdd 100644 --- a/net/sched/act_simple.c +++ b/net/sched/act_simple.c @@ -100,16 +100,20 @@ static int tcf_simp_init(struct net *net, struct nlat= tr *nla, int ret =3D 0, err; u32 index; =20 - if (nla =3D=3D NULL) + if (!nla) { + NL_SET_ERR_MSG_MOD(extack, "Sample requires attributes to be passed"); return -EINVAL; + } =20 err =3D nla_parse_nested_deprecated(tb, TCA_DEF_MAX, nla, simple_policy, NULL); if (err < 0) return err; =20 - if (tb[TCA_DEF_PARMS] =3D=3D NULL) + if (!tb[TCA_DEF_PARMS]) { + NL_SET_ERR_MSG_MOD(extack, "Missing required sample action parameters"); return -EINVAL; + } =20 parm =3D nla_data(tb[TCA_DEF_PARMS]); index =3D parm->index; @@ -121,6 +125,7 @@ static int tcf_simp_init(struct net *net, struct nlattr= *nla, return ACT_P_BOUND; =20 if (tb[TCA_DEF_DATA] =3D=3D NULL) { + NL_SET_ERR_MSG_MOD(extack, "Missing simple action default data"); if (exists) tcf_idr_release(*a, bind); else diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c index 754f78b35bb8..671ca64a2c33 100644 --- a/net/sched/act_skbedit.c +++ b/net/sched/act_skbedit.c @@ -133,16 +133,20 @@ static int tcf_skbedit_init(struct net *net, struct n= lattr *nla, int ret =3D 0, err; u32 index; =20 - if (nla =3D=3D NULL) + if (!nla) { + NL_SET_ERR_MSG_MOD(extack, "Skbedit requires attributes to be passed"); return -EINVAL; + } =20 err =3D nla_parse_nested_deprecated(tb, TCA_SKBEDIT_MAX, nla, skbedit_policy, NULL); if (err < 0) return err; =20 - if (tb[TCA_SKBEDIT_PARMS] =3D=3D NULL) + if (!tb[TCA_SKBEDIT_PARMS]) { + NL_SET_ERR_MSG_MOD(extack, "Missing required skbedit parameters"); return -EINVAL; + } =20 if (tb[TCA_SKBEDIT_PRIORITY] !=3D NULL) { flags |=3D SKBEDIT_F_PRIORITY; @@ -161,8 +165,10 @@ static int tcf_skbedit_init(struct net *net, struct nl= attr *nla, =20 if (tb[TCA_SKBEDIT_PTYPE] !=3D NULL) { ptype =3D nla_data(tb[TCA_SKBEDIT_PTYPE]); - if (!skb_pkt_type_ok(*ptype)) + if (!skb_pkt_type_ok(*ptype)) { + NL_SET_ERR_MSG_MOD(extack, "ptype is not a valid"); return -EINVAL; + } flags |=3D SKBEDIT_F_PTYPE; } =20 @@ -212,6 +218,7 @@ static int tcf_skbedit_init(struct net *net, struct nla= ttr *nla, return ACT_P_BOUND; =20 if (!flags) { + NL_SET_ERR_MSG_MOD(extack, "No skbedit action flag"); if (exists) tcf_idr_release(*a, bind); else diff --git a/net/sched/act_skbmod.c b/net/sched/act_skbmod.c index bcb673ab0008..c80828cdeb69 100644 --- a/net/sched/act_skbmod.c +++ b/net/sched/act_skbmod.c @@ -119,16 +119,20 @@ static int tcf_skbmod_init(struct net *net, struct nl= attr *nla, u16 eth_type =3D 0; int ret =3D 0, err; =20 - if (!nla) + if (!nla) { + NL_SET_ERR_MSG_MOD(extack, "Skbmod requires attributes to be passed"); return -EINVAL; + } =20 err =3D nla_parse_nested_deprecated(tb, TCA_SKBMOD_MAX, nla, skbmod_policy, NULL); if (err < 0) return err; =20 - if (!tb[TCA_SKBMOD_PARMS]) + if (!tb[TCA_SKBMOD_PARMS]) { + NL_SET_ERR_MSG_MOD(extack, "Missing required skbmod parameters"); return -EINVAL; + } =20 if (tb[TCA_SKBMOD_DMAC]) { daddr =3D nla_data(tb[TCA_SKBMOD_DMAC]); @@ -160,6 +164,7 @@ static int tcf_skbmod_init(struct net *net, struct nlat= tr *nla, return ACT_P_BOUND; =20 if (!lflags) { + NL_SET_ERR_MSG_MOD(extack, "No skbmod action flag"); if (exists) tcf_idr_release(*a, bind); else diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c index 836183011a7c..b468a4c8a904 100644 --- a/net/sched/act_vlan.c +++ b/net/sched/act_vlan.c @@ -134,16 +134,20 @@ static int tcf_vlan_init(struct net *net, struct nlat= tr *nla, int ret =3D 0, err; u32 index; =20 - if (!nla) + if (!nla) { + NL_SET_ERR_MSG_MOD(extack, "Vlan requires attributes to be passed"); return -EINVAL; + } =20 err =3D nla_parse_nested_deprecated(tb, TCA_VLAN_MAX, nla, vlan_policy, NULL); if (err < 0) return err; =20 - if (!tb[TCA_VLAN_PARMS]) + if (!tb[TCA_VLAN_PARMS]) { + NL_SET_ERR_MSG_MOD(extack, "Missing required vlan action parameters"); return -EINVAL; + } parm =3D nla_data(tb[TCA_VLAN_PARMS]); index =3D parm->index; err =3D tcf_idr_check_alloc(tn, &index, a, bind); --=20 2.43.0