Skip to content

Commit e2a8910

Browse files
palismfrench
authored andcommitted
cifs: Fix buffer overflow when parsing NFS reparse points
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: d5ecebc ("smb3: Allow query of symlinks stored as reparse points") Reviewed-by: Paulo Alcantara (Red Hat) <[email protected]> Signed-off-by: Pali Rohár <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent e9f49fe commit e2a8910

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

fs/smb/client/reparse.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,16 @@ static int parse_reparse_posix(struct reparse_posix_data *buf,
320320
unsigned int len;
321321
u64 type;
322322

323+
len = le16_to_cpu(buf->ReparseDataLength);
324+
if (len < sizeof(buf->InodeType)) {
325+
cifs_dbg(VFS, "srv returned malformed nfs buffer\n");
326+
return -EIO;
327+
}
328+
329+
len -= sizeof(buf->InodeType);
330+
323331
switch ((type = le64_to_cpu(buf->InodeType))) {
324332
case NFS_SPECFILE_LNK:
325-
len = le16_to_cpu(buf->ReparseDataLength);
326333
data->symlink_target = cifs_strndup_from_utf16(buf->DataBuffer,
327334
len, true,
328335
cifs_sb->local_nls);
@@ -482,12 +489,18 @@ bool cifs_reparse_point_to_fattr(struct cifs_sb_info *cifs_sb,
482489
u32 tag = data->reparse.tag;
483490

484491
if (tag == IO_REPARSE_TAG_NFS && buf) {
492+
if (le16_to_cpu(buf->ReparseDataLength) < sizeof(buf->InodeType))
493+
return false;
485494
switch (le64_to_cpu(buf->InodeType)) {
486495
case NFS_SPECFILE_CHR:
496+
if (le16_to_cpu(buf->ReparseDataLength) != sizeof(buf->InodeType) + 8)
497+
return false;
487498
fattr->cf_mode |= S_IFCHR;
488499
fattr->cf_rdev = reparse_mkdev(buf->DataBuffer);
489500
break;
490501
case NFS_SPECFILE_BLK:
502+
if (le16_to_cpu(buf->ReparseDataLength) != sizeof(buf->InodeType) + 8)
503+
return false;
491504
fattr->cf_mode |= S_IFBLK;
492505
fattr->cf_rdev = reparse_mkdev(buf->DataBuffer);
493506
break;

0 commit comments

Comments
 (0)