[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20241022171515.3330183-1-henrique.carvalho@suse.com>
Date: Tue, 22 Oct 2024 14:15:15 -0300
From: Henrique Carvalho <henrique.carvalho@...e.com>
To: markus.elfring@....de
Cc: bharathsm@...rosoft.com,
kernel-janitors@...r.kernel.org,
linux-cifs@...r.kernel.org,
linux-kernel@...r.kernel.org,
make24@...as.ac.cn,
pc@...guebit.com,
ronniesahlberg@...il.com,
samba-technical@...ts.samba.org,
sfrench@...ba.org,
sprasad@...rosoft.com,
tom@...pey.com,
ematsumiya@...e.de,
Henrique Carvalho <henrique.carvalho@...e.com>
Subject: [PATCH v2] fs_context.c: smb3_reconfigure: Handle kstrdup failures for passwords
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@...as.ac.cn>
Signed-off-by: Henrique Carvalho <henrique.carvalho@...e.com>
---
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
Powered by blists - more mailing lists