Commit 4029e1ea authored by Pali Rohár's avatar Pali Rohár Committed by Long Li
Browse files

cifs: Fix buffer overflow when parsing NFS reparse points

mainline inclusion
from mainline-v6.10-rc2
commit e2a8910af01653c1c268984855629d71fb81f404
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYRA3
CVE: CVE-2024-49996

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e2a8910af01653c1c268984855629d71fb81f404



--------------------------------

ReparseDataLength is sum of the InodeType size and DataBuffer size.
So to get DataBuffer size it is needed to subtract InodeType's size from
ReparseDataLength.

Function cifs_strndup_from_utf16() is currentlly accessing buf->DataBuffer
at position after the end of the buffer because it does not subtract
InodeType size from the length. Fix this problem and correctly subtract
variable len.

Member InodeType is present only when reparse buffer is large enough. Check
for ReparseDataLength before accessing InodeType to prevent another invalid
memory access.

Major and minor rdev values are present also only when reparse buffer is
large enough. Check for reparse buffer size before calling reparse_mkdev().

Fixes: d5ecebc4 ("smb3: Allow query of symlinks stored as reparse points")
Reviewed-by: default avatarPaulo Alcantara (Red Hat) <pc@manguebit.com>
Signed-off-by: default avatarPali Rohár <pali@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Conflicts:
	fs/cifs/smb2ops.c
	fs/smb/client/reparse.c
[The cause of the conflict is that the path of the code has changed, and
the mainline kernel has changed a lot.]
Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
parent 74ea6865
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -2809,6 +2809,12 @@ parse_reparse_posix(struct reparse_posix_data *symlink_buf,

	/* See MS-FSCC 2.1.2.6 for the 'NFS' style reparse tags */
	len = le16_to_cpu(symlink_buf->ReparseDataLength);
	if (len < sizeof(symlink_buf->InodeType)) {
		cifs_dbg(VFS, "srv returned malformed nfs buffer\n");
		return -EIO;
	}

	len -= sizeof(symlink_buf->InodeType);

	if (le64_to_cpu(symlink_buf->InodeType) != NFS_SPECFILE_LNK) {
		cifs_dbg(VFS, "%lld not a supported symlink type\n",