From: Paulo Alcantara <pc@manguebit.org>
To: ssrane_b23@ee.vjti.ac.in, sfrench@samba.org
Cc: ronniesahlberg@gmail.com, sprasad@microsoft.com, tom@talpey.com,
bharathsm@microsoft.com, linux-cifs@vger.kernel.org,
samba-technical@lists.samba.org, linux-kernel@vger.kernel.org,
skhan@linuxfoundation.org, linux-kernel-mentees@lists.linux.dev,
david.hunter.linux@gmail.com, khalid@kernel.org,
Shaurya Rane <ssrane_b23@ee.vjti.ac.in>,
syzbot+87be6809ed9bf6d718e3@syzkaller.appspotmail.com
Subject: Re: [PATCH] cifs: fix memory leak in smb3_fs_context_parse_param error path
Date: Fri, 21 Nov 2025 09:39:18 -0300 [thread overview]
Message-ID: <33405621d347fe99dd3a26dc5b67d417@manguebit.org> (raw)
In-Reply-To: <20251118150257.35455-1-ssranevjti@gmail.com>
ssrane_b23@ee.vjti.ac.in writes:
> From: Shaurya Rane <ssrane_b23@ee.vjti.ac.in>
>
> Add proper cleanup of ctx->source and fc->source to the
> cifs_parse_mount_err error handler. This ensures that memory allocated
> for the source strings is correctly freed on all error paths, matching
> the cleanup already performed in the success path by
> smb3_cleanup_fs_context_contents().
> Pointers are also set to NULL after freeing to prevent potential
> double-free issues.
>
> This change fixes a memory leak originally detected by syzbot. The
> leak occurred when processing Opt_source mount options if an error
> happened after ctx->source and fc->source were successfully
> allocated but before the function completed.
>
> The specific leak sequence was:
> 1. ctx->source = smb3_fs_context_fullpath(ctx, '/') allocates memory
> 2. fc->source = kstrdup(ctx->source, GFP_KERNEL) allocates more memory
> 3. A subsequent error jumps to cifs_parse_mount_err
> 4. The old error handler freed passwords but not the source strings,
> causing the memory to leak.
>
> This issue was not addressed by commit e8c73eb7db0a ("cifs: client:
> fix memory leak in smb3_fs_context_parse_param"), which only fixed
> leaks from repeated fsconfig() calls but not this error path.
>
> Reported-by: syzbot+87be6809ed9bf6d718e3@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=87be6809ed9bf6d718e3
> Fixes: 24e0a1eff9e2 ("cifs: switch to new mount api")
> Signed-off-by: Shaurya Rane <ssrane_b23@ee.vjti.ac.in>
> ---
> fs/smb/client/fs_context.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/fs/smb/client/fs_context.c b/fs/smb/client/fs_context.c
> index 0f894d09157b..975f1fa153fd 100644
> --- a/fs/smb/client/fs_context.c
> +++ b/fs/smb/client/fs_context.c
> @@ -1834,6 +1834,12 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,
> ctx->password = NULL;
> kfree_sensitive(ctx->password2);
> ctx->password2 = NULL;
> + kfree(ctx->source);
> + ctx->source = NULL;
> + if (fc) {
> + kfree(fc->source);
> + fc->source = NULL;
> + }
The non-NULL check of @fc makes no sense.
Otherwise looks good:
Reviewed-by: Paulo Alcantara (Red Hat) <pc@manguebit.org>
prev parent reply other threads:[~2025-11-21 12:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-18 15:02 [PATCH] cifs: fix memory leak in smb3_fs_context_parse_param error path ssrane_b23
2025-11-18 20:00 ` Steve French
2025-11-21 12:39 ` Paulo Alcantara [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=33405621d347fe99dd3a26dc5b67d417@manguebit.org \
--to=pc@manguebit.org \
--cc=bharathsm@microsoft.com \
--cc=david.hunter.linux@gmail.com \
--cc=khalid@kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel-mentees@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=ronniesahlberg@gmail.com \
--cc=samba-technical@lists.samba.org \
--cc=sfrench@samba.org \
--cc=skhan@linuxfoundation.org \
--cc=sprasad@microsoft.com \
--cc=ssrane_b23@ee.vjti.ac.in \
--cc=syzbot+87be6809ed9bf6d718e3@syzkaller.appspotmail.com \
--cc=tom@talpey.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