tentatively merged into cifs-2.6.git for-next pending review and more testing
On Tue, Oct 22, 2024 at 1:22 PM Henrique Carvalho
<henrique.carvalho@xxxxxxxx> wrote:
>
> In smb3_reconfigure(), after duplicating ctx->password and
> ctx->password2 with kstrdup(), we need to check for allocation
> failures.
>
> If ses->password allocation fails, return -ENOMEM.
> If ses->password2 allocation fails, free ses->password, set it
> to NULL, and return -ENOMEM.
>
> Fixes: c1eb537bf456 ("cifs: allow changing password during remount")
> Signed-off-by: Haoxiang Li <make24@xxxxxxxxxxx>
> Signed-off-by: Henrique Carvalho <henrique.carvalho@xxxxxxxx>
> ---
> V2 -> V3: Adjust commit subject.
> V1 -> V2: Decoupled checks for ses->password and ses->password2. Ensured
> ses->password is freed and set to NULL if ses->password2 allocation
> fails. Corrected return value. Improved commit message.
>
> fs/smb/client/fs_context.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/fs/smb/client/fs_context.c b/fs/smb/client/fs_context.c
> index 28c4e576d460a..5c5a52019efad 100644
> --- a/fs/smb/client/fs_context.c
> +++ b/fs/smb/client/fs_context.c
> @@ -920,8 +920,15 @@ static int smb3_reconfigure(struct fs_context *fc)
> else {
> kfree_sensitive(ses->password);
> ses->password = kstrdup(ctx->password, GFP_KERNEL);
> + if (!ses->password)
> + return -ENOMEM;
> kfree_sensitive(ses->password2);
> ses->password2 = kstrdup(ctx->password2, GFP_KERNEL);
> + if (!ses->password2) {
> + kfree_sensitive(ses->password);
> + ses->password = NULL;
> + return -ENOMEM;
> + }
> }
> STEAL_STRING(cifs_sb, ctx, domainname);
> STEAL_STRING(cifs_sb, ctx, nodename);
> --
> 2.46.0
>
>
--
Thanks,
Steve
