]> git.hungrycats.org Git - linux/commitdiff
cifs: Fix parsing reparse point with native symlink in SMB1 non-UNICODE session
authorPali Rohár <pali@kernel.org>
Sun, 6 Oct 2024 17:30:01 +0000 (19:30 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Dec 2024 09:32:57 +0000 (10:32 +0100)
[ Upstream commit f4ca4f5a36eac9b4da378a0f28cbbe38534a0901 ]

SMB1 NT_TRANSACT_IOCTL/FSCTL_GET_REPARSE_POINT even in non-UNICODE mode
returns reparse buffer in UNICODE/UTF-16 format.

This is because FSCTL_GET_REPARSE_POINT is NT-based IOCTL which does not
distinguish between 8-bit non-UNICODE and 16-bit UNICODE modes and its path
buffers are always encoded in UTF-16.

This change fixes reading of native symlinks in SMB1 when UNICODE session
is not active.

Fixes: ed3e0a149b58 ("smb: client: implement ->query_reparse_point() for SMB1")
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/smb/client/smb1ops.c

index 5c8fb75b6145703920dc81aa2cf4f1206aaced83..b0c0572f9d1fbc69549d8327e08366254f5503a7 100644 (file)
@@ -1000,12 +1000,11 @@ static int cifs_parse_reparse_point(struct cifs_sb_info *cifs_sb,
 {
        struct reparse_data_buffer *buf;
        TRANSACT_IOCTL_RSP *io = rsp_iov->iov_base;
-       bool unicode = !!(io->hdr.Flags2 & SMBFLG2_UNICODE);
        u32 plen = le16_to_cpu(io->ByteCount);
 
        buf = (struct reparse_data_buffer *)((__u8 *)&io->hdr.Protocol +
                                             le32_to_cpu(io->DataOffset));
-       return parse_reparse_point(buf, plen, cifs_sb, full_path, unicode, data);
+       return parse_reparse_point(buf, plen, cifs_sb, full_path, true, data);
 }
 
 static bool