2023-10-20 00:41:56

by Steven Rostedt

Subject: [PATCH] eventfs: Fix failure path in eventfs_create_events_dir()

From: "Steven Rostedt (Google)" <[email protected]>

The failure path of allocating ei goes to a path that dereferences ei.
Add another label that skips over the ei dereferences to do the rest of
the clean up.

Link: https://lore.kernel.org/all/[email protected]/

Fixes: 5790b1fb3d67 ("eventfs: Remove eventfs_file and just use eventfs_inode")
Reported-by: Julia Lawall <[email protected]>
Signed-off-by: Steven Rostedt (Google) <[email protected]>
---
fs/tracefs/event_inode.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c
index 9f19b6608954..1885f1f1f339 100644
--- a/fs/tracefs/event_inode.c
+++ b/fs/tracefs/event_inode.c
@@ -735,7 +735,7 @@ struct eventfs_inode *eventfs_create_events_dir(const char *name, struct dentry

ei = kzalloc(sizeof(*ei), GFP_KERNEL);
if (!ei)
- goto fail;
+ goto fail_ei;

inode = tracefs_get_inode(dentry->d_sb);
if (unlikely(!inode))
@@ -781,6 +781,7 @@ struct eventfs_inode *eventfs_create_events_dir(const char *name, struct dentry
fail:
kfree(ei->d_children);
kfree(ei);
+ fail_ei:
tracefs_failed_creating(dentry);
return ERR_PTR(-ENOMEM);
}
--
2.42.0

2023-10-23 09:21:12

by Mukesh Ojha

Subject: Re: [PATCH] eventfs: Fix failure path in eventfs_create_events_dir()

On 10/20/2023 6:11 AM, Steven Rostedt wrote:
> From: "Steven Rostedt (Google)" <[email protected]>
>
> The failure path of allocating ei goes to a path that dereferences ei.
> Add another label that skips over the ei dereferences to do the rest of
> the clean up.
>
> Link: https://lore.kernel.org/all/[email protected]/
>
> Fixes: 5790b1fb3d67 ("eventfs: Remove eventfs_file and just use eventfs_inode")
> Reported-by: Julia Lawall <[email protected]>
> Signed-off-by: Steven Rostedt (Google) <[email protected]>

Reviewed-by: Mukesh Ojha <[email protected]>

-Mukesh

> ---
> fs/tracefs/event_inode.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c
> index 9f19b6608954..1885f1f1f339 100644
> --- a/fs/tracefs/event_inode.c
> +++ b/fs/tracefs/event_inode.c
> @@ -735,7 +735,7 @@ struct eventfs_inode *eventfs_create_events_dir(const char *name, struct dentry
>
> ei = kzalloc(sizeof(*ei), GFP_KERNEL);
> if (!ei)
> - goto fail;
> + goto fail_ei;
>
> inode = tracefs_get_inode(dentry->d_sb);
> if (unlikely(!inode))
> @@ -781,6 +781,7 @@ struct eventfs_inode *eventfs_create_events_dir(const char *name, struct dentry
> fail:
> kfree(ei->d_children);
> kfree(ei);
> + fail_ei:
> tracefs_failed_creating(dentry);
> return ERR_PTR(-ENOMEM);
> }