From: Mark Rutland <mark.rutland@arm.com>
To: Erick Archer <erick.archer@gmx.com>
Cc: Steven Rostedt <rostedt@goodmis.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
linux-hardening@vger.kernel.org
Subject: Re: [PATCH] eventfs: Use kcalloc() instead of kzalloc()
Date: Mon, 15 Jan 2024 10:06:24 +0000 [thread overview]
Message-ID: <ZaUDoG5qnkC8G3qx@FVFF77S0Q05N> (raw)
In-Reply-To: <20240114105340.5746-1-erick.archer@gmx.com>
On Sun, Jan 14, 2024 at 11:53:40AM +0100, Erick Archer wrote:
> Use 2-factor multiplication argument form kcalloc() instead
> of kzalloc().
>
> Link: https://github.com/KSPP/linux/issues/162
> Signed-off-by: Erick Archer <erick.archer@gmx.com>
Could you put something in the commit message explaining *why* this change
should be made?
I assume that this is so that overflows during multiplication can be caught and
handled in some way, but the commit message doesn't say that, and nor does the
linked github page.
The patch itself looks fine.
Thanks,
Mark.
> ---
> fs/tracefs/event_inode.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c
> index fdff53d5a1f8..f8196289692c 100644
> --- a/fs/tracefs/event_inode.c
> +++ b/fs/tracefs/event_inode.c
> @@ -93,7 +93,7 @@ static int eventfs_set_attr(struct mnt_idmap *idmap, struct dentry *dentry,
> /* Preallocate the children mode array if necessary */
> if (!(dentry->d_inode->i_mode & S_IFDIR)) {
> if (!ei->entry_attrs) {
> - ei->entry_attrs = kzalloc(sizeof(*ei->entry_attrs) * ei->nr_entries,
> + ei->entry_attrs = kcalloc(ei->nr_entries, sizeof(*ei->entry_attrs),
> GFP_NOFS);
> if (!ei->entry_attrs) {
> ret = -ENOMEM;
> @@ -874,7 +874,7 @@ struct eventfs_inode *eventfs_create_dir(const char *name, struct eventfs_inode
> }
>
> if (size) {
> - ei->d_children = kzalloc(sizeof(*ei->d_children) * size, GFP_KERNEL);
> + ei->d_children = kcalloc(size, sizeof(*ei->d_children), GFP_KERNEL);
> if (!ei->d_children) {
> kfree_const(ei->name);
> kfree(ei);
> @@ -941,7 +941,7 @@ struct eventfs_inode *eventfs_create_events_dir(const char *name, struct dentry
> goto fail;
>
> if (size) {
> - ei->d_children = kzalloc(sizeof(*ei->d_children) * size, GFP_KERNEL);
> + ei->d_children = kcalloc(size, sizeof(*ei->d_children), GFP_KERNEL);
> if (!ei->d_children)
> goto fail;
> }
> --
> 2.25.1
>
>
prev parent reply other threads:[~2024-01-15 10:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-14 10:53 [PATCH] eventfs: Use kcalloc() instead of kzalloc() Erick Archer
2024-01-15 10:06 ` Mark Rutland [this message]
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=ZaUDoG5qnkC8G3qx@FVFF77S0Q05N \
--to=mark.rutland@arm.com \
--cc=erick.archer@gmx.com \
--cc=gustavoars@kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=rostedt@goodmis.org \
/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