* [PATCH] fs/ntfs3: Fix some memory leaks in an error handling path of 'log_replay()'
@ 2021-11-11 7:45 Christophe JAILLET
2021-11-23 15:47 ` Konstantin Komarov
0 siblings, 1 reply; 2+ messages in thread
From: Christophe JAILLET @ 2021-11-11 7:45 UTC (permalink / raw)
To: almaz.alexandrovich
Cc: ntfs3, linux-kernel, kernel-janitors, Christophe JAILLET
All error handling paths lead to 'out' where many resources are freed.
Do it as well here instead of a direct return, otherwise 'log', 'ra' and
'log->one_page_buf' (at least) will leak.
Fixes: b46acd6a6a62 ("fs/ntfs3: Add NTFS journal")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
fs/ntfs3/fslog.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
index 06492f088d60..915f42cf07bc 100644
--- a/fs/ntfs3/fslog.c
+++ b/fs/ntfs3/fslog.c
@@ -4085,8 +4085,10 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)
if (client == LFS_NO_CLIENT_LE) {
/* Insert "NTFS" client LogFile. */
client = ra->client_idx[0];
- if (client == LFS_NO_CLIENT_LE)
- return -EINVAL;
+ if (client == LFS_NO_CLIENT_LE) {
+ err = -EINVAL;
+ goto out;
+ }
t16 = le16_to_cpu(client);
cr = ca + t16;
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] fs/ntfs3: Fix some memory leaks in an error handling path of 'log_replay()'
2021-11-11 7:45 [PATCH] fs/ntfs3: Fix some memory leaks in an error handling path of 'log_replay()' Christophe JAILLET
@ 2021-11-23 15:47 ` Konstantin Komarov
0 siblings, 0 replies; 2+ messages in thread
From: Konstantin Komarov @ 2021-11-23 15:47 UTC (permalink / raw)
To: Christophe JAILLET; +Cc: ntfs3, linux-kernel, kernel-janitors
On 11.11.2021 10:45, Christophe JAILLET wrote:
> All error handling paths lead to 'out' where many resources are freed.
>
> Do it as well here instead of a direct return, otherwise 'log', 'ra' and
> 'log->one_page_buf' (at least) will leak.
>
> Fixes: b46acd6a6a62 ("fs/ntfs3: Add NTFS journal")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> fs/ntfs3/fslog.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
> index 06492f088d60..915f42cf07bc 100644
> --- a/fs/ntfs3/fslog.c
> +++ b/fs/ntfs3/fslog.c
> @@ -4085,8 +4085,10 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)
> if (client == LFS_NO_CLIENT_LE) {
> /* Insert "NTFS" client LogFile. */
> client = ra->client_idx[0];
> - if (client == LFS_NO_CLIENT_LE)
> - return -EINVAL;
> + if (client == LFS_NO_CLIENT_LE) {
> + err = -EINVAL;
> + goto out;
> + }
>
> t16 = le16_to_cpu(client);
> cr = ca + t16;
>
Thanks for patch, applied!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-23 15:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-11 7:45 [PATCH] fs/ntfs3: Fix some memory leaks in an error handling path of 'log_replay()' Christophe JAILLET
2021-11-23 15:47 ` Konstantin Komarov
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).