From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
To: Cong Wang <xiyou.wangcong@gmail.com>
Cc: netdev@vger.kernel.org, Jamal Hadi Salim <jhs@mojatatu.com>,
Jiri Pirko <jiri@resnulli.us>
Subject: Re: [Patch net] net_sched: fix backward compatibility for TCA_ACT_KIND
Date: Tue, 8 Oct 2019 09:12:29 -0300 [thread overview]
Message-ID: <20191008121229.GR3431@localhost.localdomain> (raw)
In-Reply-To: <20191007202629.32462-2-xiyou.wangcong@gmail.com>
On Mon, Oct 07, 2019 at 01:26:29PM -0700, Cong Wang wrote:
> For TCA_ACT_KIND, we have to keep the backward compatibility too,
> and rely on nla_strlcpy() to check and terminate the string with
> a NUL.
>
> Note for TC actions, nla_strcmp() is already used to compare kind
> strings, so we don't need to fix other places.
>
> Fixes: 199ce850ce11 ("net_sched: add policy validation for action attributes")
> Reported-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
> Cc: Jamal Hadi Salim <jhs@mojatatu.com>
> Cc: Jiri Pirko <jiri@resnulli.us>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
> ---
> net/sched/act_api.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/net/sched/act_api.c b/net/sched/act_api.c
> index da99667589f8..4684f2f24b17 100644
> --- a/net/sched/act_api.c
> +++ b/net/sched/act_api.c
> @@ -832,8 +832,7 @@ static struct tc_cookie *nla_memdup_cookie(struct nlattr **tb)
> }
>
> static const struct nla_policy tcf_action_policy[TCA_ACT_MAX + 1] = {
> - [TCA_ACT_KIND] = { .type = NLA_NUL_STRING,
> - .len = IFNAMSIZ - 1 },
> + [TCA_ACT_KIND] = { .type = NLA_STRING },
> [TCA_ACT_INDEX] = { .type = NLA_U32 },
> [TCA_ACT_COOKIE] = { .type = NLA_BINARY,
> .len = TC_COOKIE_MAX_SIZE },
> @@ -865,8 +864,10 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,
> NL_SET_ERR_MSG(extack, "TC action kind must be specified");
> goto err_out;
> }
> - nla_strlcpy(act_name, kind, IFNAMSIZ);
> -
> + if (nla_strlcpy(act_name, kind, IFNAMSIZ) >= IFNAMSIZ) {
> + NL_SET_ERR_MSG(extack, "TC action name too long");
> + goto err_out;
> + }
> if (tb[TCA_ACT_COOKIE]) {
> cookie = nla_memdup_cookie(tb);
> if (!cookie) {
> --
> 2.21.0
>
next prev parent reply other threads:[~2019-10-08 12:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-07 20:26 [Patch net] net_sched: fix backward compatibility for TCA_ACT_KIND Cong Wang
2019-10-08 12:12 ` Marcelo Ricardo Leitner [this message]
2019-10-08 23:40 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191008121229.GR3431@localhost.localdomain \
--to=marcelo.leitner@gmail.com \
--cc=jhs@mojatatu.com \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.