Skip to content
This repository was archived by the owner on Apr 21, 2025. It is now read-only.

Commit edefc4b

Browse files
Paulo Alcantaragregkh
Paulo Alcantara
authored and
gregkh
committed
cifs: fix NULL ptr dereference in smb2_ioctl_query_info()
commit d6f5e35 upstream. When calling smb2_ioctl_query_info() with invalid smb_query_info::flags, a NULL ptr dereference is triggered when trying to kfree() uninitialised rqst[n].rq_iov array. This also fixes leaked paths that are created in SMB2_open_init() which required SMB2_open_free() to properly free them. Here is a small C reproducer that triggers it #include <stdio.h> #include <stdlib.h> #include <stdint.h> #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> #define die(s) perror(s), exit(1) #define QUERY_INFO 0xc018cf07 int main(int argc, char *argv[]) { int fd; if (argc < 2) exit(1); fd = open(argv[1], O_RDONLY); if (fd == -1) die("open"); if (ioctl(fd, QUERY_INFO, (uint32_t[]) { 0, 0, 0, 4, 0, 0}) == -1) die("ioctl"); close(fd); return 0; } mount.cifs //srv/share /mnt -o ... gcc repro.c && ./a.out /mnt/f0 [ 1832.124468] CIFS: VFS: \\w22-dc.zelda.test\test Invalid passthru query flags: 0x4 [ 1832.125043] general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP KASAN NOPTI [ 1832.125764] KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] [ 1832.126241] CPU: 3 PID: 1133 Comm: a.out Not tainted 5.17.0-rc8 #2 [ 1832.126630] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.15.0-0-g2dd4b9b-rebuilt.opensuse.org 04/01/2014 [ 1832.127322] RIP: 0010:smb2_ioctl_query_info+0x7a3/0xe30 [cifs] [ 1832.127749] Code: 00 00 00 fc ff df 48 c1 ea 03 80 3c 02 00 0f 85 6c 05 00 00 48 b8 00 00 00 00 00 fc ff df 4d 8b 74 24 28 4c 89 f2 48 c1 ea 03 <80> 3c 02 00 0f 85 cb 04 00 00 49 8b 3e e8 bb fc fa ff 48 89 da 48 [ 1832.128911] RSP: 0018:ffffc90000957b08 EFLAGS: 00010256 [ 1832.129243] RAX: dffffc0000000000 RBX: ffff888117e9b850 RCX: ffffffffa020580d [ 1832.129691] RDX: 0000000000000000 RSI: 0000000000000004 RDI: ffffffffa043a2c0 [ 1832.130137] RBP: ffff888117e9b878 R08: 0000000000000001 R09: 0000000000000003 [ 1832.130585] R10: fffffbfff4087458 R11: 0000000000000001 R12: ffff888117e9b800 [ 1832.131037] R13: 00000000ffffffea R14: 0000000000000000 R15: ffff888117e9b8a8 [ 1832.131485] FS: 00007fcee9900740(0000) GS:ffff888151a00000(0000) knlGS:0000000000000000 [ 1832.131993] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1832.132354] CR2: 00007fcee9a1ef5e CR3: 0000000114cd2000 CR4: 0000000000350ee0 [ 1832.132801] Call Trace: [ 1832.132962] <TASK> [ 1832.133104] ? smb2_query_reparse_tag+0x890/0x890 [cifs] [ 1832.133489] ? cifs_mapchar+0x460/0x460 [cifs] [ 1832.133822] ? rcu_read_lock_sched_held+0x3f/0x70 [ 1832.134125] ? cifs_strndup_to_utf16+0x15b/0x250 [cifs] [ 1832.134502] ? lock_downgrade+0x6f0/0x6f0 [ 1832.134760] ? cifs_convert_path_to_utf16+0x198/0x220 [cifs] [ 1832.135170] ? smb2_check_message+0x1080/0x1080 [cifs] [ 1832.135545] cifs_ioctl+0x1577/0x3320 [cifs] [ 1832.135864] ? lock_downgrade+0x6f0/0x6f0 [ 1832.136125] ? cifs_readdir+0x2e60/0x2e60 [cifs] [ 1832.136468] ? rcu_read_lock_sched_held+0x3f/0x70 [ 1832.136769] ? __rseq_handle_notify_resume+0x80b/0xbe0 [ 1832.137096] ? __up_read+0x192/0x710 [ 1832.137327] ? __ia32_sys_rseq+0xf0/0xf0 [ 1832.137578] ? __x64_sys_openat+0x11f/0x1d0 [ 1832.137850] __x64_sys_ioctl+0x127/0x190 [ 1832.138103] do_syscall_64+0x3b/0x90 [ 1832.138378] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 1832.138702] RIP: 0033:0x7fcee9a253df [ 1832.138937] Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <41> 89 c0 3d 00 f0 ff ff 77 1f 48 8b 44 24 18 64 48 2b 04 25 28 00 [ 1832.140107] RSP: 002b:00007ffeba94a8a0 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 1832.140606] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007fcee9a253df [ 1832.141058] RDX: 00007ffeba94a910 RSI: 00000000c018cf07 RDI: 0000000000000003 [ 1832.141503] RBP: 00007ffeba94a930 R08: 00007fcee9b24db0 R09: 00007fcee9b45c4e [ 1832.141948] R10: 00007fcee9918d40 R11: 0000000000000246 R12: 00007ffeba94aa48 [ 1832.142396] R13: 0000000000401176 R14: 0000000000403df8 R15: 00007fcee9b78000 [ 1832.142851] </TASK> [ 1832.142994] Modules linked in: cifs cifs_arc4 cifs_md4 bpf_preload [last unloaded: cifs] Cc: stable@vger.kernel.org Signed-off-by: Paulo Alcantara (SUSE) <pc@cjr.nz> Signed-off-by: Steve French <stfrench@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9963cce commit edefc4b

1 file changed

Lines changed: 65 additions & 59 deletions

File tree

‎fs/cifs/smb2ops.c‎

Lines changed: 65 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,6 +1526,7 @@ smb2_ioctl_query_info(const unsigned int xid,
15261526
unsigned int size[2];
15271527
void *data[2];
15281528
int create_options = is_dir ? CREATE_NOT_FILE : CREATE_NOT_DIR;
1529+
void (*free_req1_func)(struct smb_rqst *r);
15291530

15301531
vars = kzalloc(sizeof(*vars), GFP_ATOMIC);
15311532
if (vars == NULL)
@@ -1535,17 +1536,18 @@ smb2_ioctl_query_info(const unsigned int xid,
15351536

15361537
resp_buftype[0] = resp_buftype[1] = resp_buftype[2] = CIFS_NO_BUFFER;
15371538

1538-
if (copy_from_user(&qi, arg, sizeof(struct smb_query_info)))
1539-
goto e_fault;
1540-
1539+
if (copy_from_user(&qi, arg, sizeof(struct smb_query_info))) {
1540+
rc = -EFAULT;
1541+
goto free_vars;
1542+
}
15411543
if (qi.output_buffer_length > 1024) {
1542-
kfree(vars);
1543-
return -EINVAL;
1544+
rc = -EINVAL;
1545+
goto free_vars;
15441546
}
15451547

15461548
if (!ses || !server) {
1547-
kfree(vars);
1548-
return -EIO;
1549+
rc = -EIO;
1550+
goto free_vars;
15491551
}
15501552

15511553
if (smb3_encryption_required(tcon))
@@ -1554,8 +1556,8 @@ smb2_ioctl_query_info(const unsigned int xid,
15541556
if (qi.output_buffer_length) {
15551557
buffer = memdup_user(arg + sizeof(struct smb_query_info), qi.output_buffer_length);
15561558
if (IS_ERR(buffer)) {
1557-
kfree(vars);
1558-
return PTR_ERR(buffer);
1559+
rc = PTR_ERR(buffer);
1560+
goto free_vars;
15591561
}
15601562
}
15611563

@@ -1594,48 +1596,45 @@ smb2_ioctl_query_info(const unsigned int xid,
15941596
rc = SMB2_open_init(tcon, server,
15951597
&rqst[0], &oplock, &oparms, path);
15961598
if (rc)
1597-
goto iqinf_exit;
1599+
goto free_output_buffer;
15981600
smb2_set_next_command(tcon, &rqst[0]);
15991601

16001602
/* Query */
16011603
if (qi.flags & PASSTHRU_FSCTL) {
16021604
/* Can eventually relax perm check since server enforces too */
1603-
if (!capable(CAP_SYS_ADMIN))
1605+
if (!capable(CAP_SYS_ADMIN)) {
16041606
rc = -EPERM;
1605-
else {
1606-
rqst[1].rq_iov = &vars->io_iov[0];
1607-
rqst[1].rq_nvec = SMB2_IOCTL_IOV_SIZE;
1608-
1609-
rc = SMB2_ioctl_init(tcon, server,
1610-
&rqst[1],
1611-
COMPOUND_FID, COMPOUND_FID,
1612-
qi.info_type, true, buffer,
1613-
qi.output_buffer_length,
1614-
CIFSMaxBufSize -
1615-
MAX_SMB2_CREATE_RESPONSE_SIZE -
1616-
MAX_SMB2_CLOSE_RESPONSE_SIZE);
1607+
goto free_open_req;
16171608
}
1609+
rqst[1].rq_iov = &vars->io_iov[0];
1610+
rqst[1].rq_nvec = SMB2_IOCTL_IOV_SIZE;
1611+
1612+
rc = SMB2_ioctl_init(tcon, server, &rqst[1], COMPOUND_FID, COMPOUND_FID,
1613+
qi.info_type, true, buffer, qi.output_buffer_length,
1614+
CIFSMaxBufSize - MAX_SMB2_CREATE_RESPONSE_SIZE -
1615+
MAX_SMB2_CLOSE_RESPONSE_SIZE);
1616+
free_req1_func = SMB2_ioctl_free;
16181617
} else if (qi.flags == PASSTHRU_SET_INFO) {
16191618
/* Can eventually relax perm check since server enforces too */
1620-
if (!capable(CAP_SYS_ADMIN))
1619+
if (!capable(CAP_SYS_ADMIN)) {
16211620
rc = -EPERM;
1622-
else if (qi.output_buffer_length < 8)
1621+
goto free_open_req;
1622+
}
1623+
if (qi.output_buffer_length < 8) {
16231624
rc = -EINVAL;
1624-
else {
1625-
rqst[1].rq_iov = &vars->si_iov[0];
1626-
rqst[1].rq_nvec = 1;
1627-
1628-
/* MS-FSCC 2.4.13 FileEndOfFileInformation */
1629-
size[0] = 8;
1630-
data[0] = buffer;
1631-
1632-
rc = SMB2_set_info_init(tcon, server,
1633-
&rqst[1],
1634-
COMPOUND_FID, COMPOUND_FID,
1635-
current->tgid,
1636-
FILE_END_OF_FILE_INFORMATION,
1637-
SMB2_O_INFO_FILE, 0, data, size);
1625+
goto free_open_req;
16381626
}
1627+
rqst[1].rq_iov = &vars->si_iov[0];
1628+
rqst[1].rq_nvec = 1;
1629+
1630+
/* MS-FSCC 2.4.13 FileEndOfFileInformation */
1631+
size[0] = 8;
1632+
data[0] = buffer;
1633+
1634+
rc = SMB2_set_info_init(tcon, server, &rqst[1], COMPOUND_FID, COMPOUND_FID,
1635+
current->tgid, FILE_END_OF_FILE_INFORMATION,
1636+
SMB2_O_INFO_FILE, 0, data, size);
1637+
free_req1_func = SMB2_set_info_free;
16391638
} else if (qi.flags == PASSTHRU_QUERY_INFO) {
16401639
rqst[1].rq_iov = &vars->qi_iov[0];
16411640
rqst[1].rq_nvec = 1;
@@ -1646,14 +1645,15 @@ smb2_ioctl_query_info(const unsigned int xid,
16461645
qi.info_type, qi.additional_information,
16471646
qi.input_buffer_length,
16481647
qi.output_buffer_length, buffer);
1648+
free_req1_func = SMB2_query_info_free;
16491649
} else { /* unknown flags */
16501650
cifs_tcon_dbg(VFS, "Invalid passthru query flags: 0x%x\n",
16511651
qi.flags);
16521652
rc = -EINVAL;
16531653
}
16541654

16551655
if (rc)
1656-
goto iqinf_exit;
1656+
goto free_open_req;
16571657
smb2_set_next_command(tcon, &rqst[1]);
16581658
smb2_set_related(&rqst[1]);
16591659

@@ -1664,14 +1664,14 @@ smb2_ioctl_query_info(const unsigned int xid,
16641664
rc = SMB2_close_init(tcon, server,
16651665
&rqst[2], COMPOUND_FID, COMPOUND_FID, false);
16661666
if (rc)
1667-
goto iqinf_exit;
1667+
goto free_req_1;
16681668
smb2_set_related(&rqst[2]);
16691669

16701670
rc = compound_send_recv(xid, ses, server,
16711671
flags, 3, rqst,
16721672
resp_buftype, rsp_iov);
16731673
if (rc)
1674-
goto iqinf_exit;
1674+
goto out;
16751675

16761676
/* No need to bump num_remote_opens since handle immediately closed */
16771677
if (qi.flags & PASSTHRU_FSCTL) {
@@ -1681,47 +1681,53 @@ smb2_ioctl_query_info(const unsigned int xid,
16811681
qi.input_buffer_length = le32_to_cpu(io_rsp->OutputCount);
16821682
if (qi.input_buffer_length > 0 &&
16831683
le32_to_cpu(io_rsp->OutputOffset) + qi.input_buffer_length
1684-
> rsp_iov[1].iov_len)
1685-
goto e_fault;
1684+
> rsp_iov[1].iov_len) {
1685+
rc = -EFAULT;
1686+
goto out;
1687+
}
16861688

16871689
if (copy_to_user(&pqi->input_buffer_length,
16881690
&qi.input_buffer_length,
1689-
sizeof(qi.input_buffer_length)))
1690-
goto e_fault;
1691+
sizeof(qi.input_buffer_length))) {
1692+
rc = -EFAULT;
1693+
goto out;
1694+
}
16911695

16921696
if (copy_to_user((void __user *)pqi + sizeof(struct smb_query_info),
16931697
(const void *)io_rsp + le32_to_cpu(io_rsp->OutputOffset),
16941698
qi.input_buffer_length))
1695-
goto e_fault;
1699+
rc = -EFAULT;
16961700
} else {
16971701
pqi = (struct smb_query_info __user *)arg;
16981702
qi_rsp = (struct smb2_query_info_rsp *)rsp_iov[1].iov_base;
16991703
if (le32_to_cpu(qi_rsp->OutputBufferLength) < qi.input_buffer_length)
17001704
qi.input_buffer_length = le32_to_cpu(qi_rsp->OutputBufferLength);
17011705
if (copy_to_user(&pqi->input_buffer_length,
17021706
&qi.input_buffer_length,
1703-
sizeof(qi.input_buffer_length)))
1704-
goto e_fault;
1707+
sizeof(qi.input_buffer_length))) {
1708+
rc = -EFAULT;
1709+
goto out;
1710+
}
17051711

17061712
if (copy_to_user(pqi + 1, qi_rsp->Buffer,
17071713
qi.input_buffer_length))
1708-
goto e_fault;
1714+
rc = -EFAULT;
17091715
}
17101716

1711-
iqinf_exit:
1712-
cifs_small_buf_release(rqst[0].rq_iov[0].iov_base);
1713-
cifs_small_buf_release(rqst[1].rq_iov[0].iov_base);
1714-
cifs_small_buf_release(rqst[2].rq_iov[0].iov_base);
1717+
out:
17151718
free_rsp_buf(resp_buftype[0], rsp_iov[0].iov_base);
17161719
free_rsp_buf(resp_buftype[1], rsp_iov[1].iov_base);
17171720
free_rsp_buf(resp_buftype[2], rsp_iov[2].iov_base);
1718-
kfree(vars);
1721+
SMB2_close_free(&rqst[2]);
1722+
free_req_1:
1723+
free_req1_func(&rqst[1]);
1724+
free_open_req:
1725+
SMB2_open_free(&rqst[0]);
1726+
free_output_buffer:
17191727
kfree(buffer);
1728+
free_vars:
1729+
kfree(vars);
17201730
return rc;
1721-
1722-
e_fault:
1723-
rc = -EFAULT;
1724-
goto iqinf_exit;
17251731
}
17261732

17271733
static ssize_t

0 commit comments

Comments
 (0)