]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
smb: server: Fix extension string in ksmbd_extract_shortname()
authorThorsten Blum <thorsten.blum@linux.dev>
Wed, 13 Aug 2025 13:32:18 +0000 (09:32 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Aug 2025 14:24:31 +0000 (16:24 +0200)
[ Upstream commit 8e7d178d06e8937454b6d2f2811fa6a15656a214 ]

In ksmbd_extract_shortname(), strscpy() is incorrectly called with the
length of the source string (excluding the NUL terminator) rather than
the size of the destination buffer. This results in "__" being copied
to 'extension' rather than "___" (two underscores instead of three).

Use the destination buffer size instead to ensure that the string "___"
(three underscores) is copied correctly.

Cc: stable@vger.kernel.org
Fixes: e2f34481b24d ("cifsd: add server-side procedures for SMB3")
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/ksmbd/smb_common.c

index e90a1e8c1951dba21a3dd51ecaee5ae5ffcb0863..0438a634f4c21d0f42fb763e30844fbefb27dd3e 100644 (file)
@@ -508,7 +508,7 @@ int ksmbd_extract_shortname(struct ksmbd_conn *conn, const char *longname,
 
        p = strrchr(longname, '.');
        if (p == longname) { /*name starts with a dot*/
-               strscpy(extension, "___", strlen("___"));
+               strscpy(extension, "___", sizeof(extension));
        } else {
                if (p) {
                        p++;