From: Taras Chornyi <tchornyi@marvell.com>
To: Jiasheng Jiang <jiasheng@iscas.ac.cn>,
vmytnyk@marvell.com, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] net: prestera: acl: Add check for kmemdup
Date: Fri, 30 Sep 2022 12:20:01 +0300 [thread overview]
Message-ID: <ac5b9485-c9cb-9458-1101-6a219ee1faa5@marvell.com> (raw)
In-Reply-To: <20220930044843.32647-1-jiasheng@iscas.ac.cn>
> ----------------------------------------------------------------------
> As the kemdup could return NULL, it should be better to check the return
> value and return error if fails.
> Moreover, the return value of prestera_acl_ruleset_keymask_set() should
> be checked by cascade.
>
> Fixes: 604ba230902d ("net: prestera: flower template support")
> Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
> ---
> drivers/net/ethernet/marvell/prestera/prestera_acl.c | 8 ++++++--
> drivers/net/ethernet/marvell/prestera/prestera_acl.h | 4 ++--
> drivers/net/ethernet/marvell/prestera/prestera_flower.c | 6 +++++-
> 3 files changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/marvell/prestera/prestera_acl.c b/drivers/net/ethernet/marvell/prestera/prestera_acl.c
> index 3d4b85f2d541..f6b2933859d0 100644
> --- a/drivers/net/ethernet/marvell/prestera/prestera_acl.c
> +++ b/drivers/net/ethernet/marvell/prestera/prestera_acl.c
> @@ -178,10 +178,14 @@ prestera_acl_ruleset_create(struct prestera_acl *acl,
> return ERR_PTR(err);
> }
>
> -void prestera_acl_ruleset_keymask_set(struct prestera_acl_ruleset *ruleset,
> - void *keymask)
> +int prestera_acl_ruleset_keymask_set(struct prestera_acl_ruleset *ruleset,
> + void *keymask)
> {
> ruleset->keymask = kmemdup(keymask, ACL_KEYMASK_SIZE, GFP_KERNEL);
> + if (!ruleset->keymask)
> + return -ENOMEM;
> +
> + return 0;
> }
>
> int prestera_acl_ruleset_offload(struct prestera_acl_ruleset *ruleset)
> diff --git a/drivers/net/ethernet/marvell/prestera/prestera_acl.h b/drivers/net/ethernet/marvell/prestera/prestera_acl.h
> index 03fc5b9dc925..131bfbc87cd7 100644
> --- a/drivers/net/ethernet/marvell/prestera/prestera_acl.h
> +++ b/drivers/net/ethernet/marvell/prestera/prestera_acl.h
> @@ -185,8 +185,8 @@ struct prestera_acl_ruleset *
> prestera_acl_ruleset_lookup(struct prestera_acl *acl,
> struct prestera_flow_block *block,
> u32 chain_index);
> -void prestera_acl_ruleset_keymask_set(struct prestera_acl_ruleset *ruleset,
> - void *keymask);
> +int prestera_acl_ruleset_keymask_set(struct prestera_acl_ruleset *ruleset,
> + void *keymask);
> bool prestera_acl_ruleset_is_offload(struct prestera_acl_ruleset *ruleset);
> int prestera_acl_ruleset_offload(struct prestera_acl_ruleset *ruleset);
> void prestera_acl_ruleset_put(struct prestera_acl_ruleset *ruleset);
> diff --git a/drivers/net/ethernet/marvell/prestera/prestera_flower.c b/drivers/net/ethernet/marvell/prestera/prestera_flower.c
> index 19d3b55c578e..cf551a8379ac 100644
> --- a/drivers/net/ethernet/marvell/prestera/prestera_flower.c
> +++ b/drivers/net/ethernet/marvell/prestera/prestera_flower.c
> @@ -452,7 +452,9 @@ int prestera_flower_tmplt_create(struct prestera_flow_block *block,
> }
>
> /* preserve keymask/template to this ruleset */
> - prestera_acl_ruleset_keymask_set(ruleset, rule.re_key.match.mask);
> + err = prestera_acl_ruleset_keymask_set(ruleset, rule.re_key.match.mask);
> + if (err)
> + goto err_ruleset_keymask_set;
>
> /* skip error, as it is not possible to reject template operation,
> * so, keep the reference to the ruleset for rules to be added
> @@ -468,6 +470,8 @@ int prestera_flower_tmplt_create(struct prestera_flow_block *block,
> list_add_rcu(&template->list, &block->template_list);
> return 0;
>
> +err_ruleset_keymask_set:
> + prestera_acl_ruleset_put(ruleset);
> err_ruleset_get:
> kfree(template);
> err_malloc:
Reviewed-by: Taras Chornyi<tchornyi@marvell.com>
next prev parent reply other threads:[~2022-09-30 9:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-30 4:48 [PATCH] net: prestera: acl: Add check for kmemdup Jiasheng Jiang
2022-09-30 9:20 ` Taras Chornyi [this message]
2022-10-03 11:40 ` patchwork-bot+netdevbpf
-- strict thread matches above, loose matches on Subject: below --
2022-09-30 5:03 Jiasheng Jiang
2022-09-30 14:29 ` Jakub Kicinski
2022-09-30 15:20 ` Joe Perches
2022-09-30 15:44 ` Jakub Kicinski
2022-09-30 16:43 ` Joe Perches
2022-09-30 16:58 ` Jakub Kicinski
2022-09-30 18:28 ` Joe Perches
2022-09-28 9:20 Jiasheng Jiang
2022-09-29 16:15 ` 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=ac5b9485-c9cb-9458-1101-6a219ee1faa5@marvell.com \
--to=tchornyi@marvell.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jiasheng@iscas.ac.cn \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=vmytnyk@marvell.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).