From: Steve French <smfrench@gmail.com>
To: ronnie sahlberg <ronniesahlberg@gmail.com>,
CIFS <linux-cifs@vger.kernel.org>
Subject: [PATCH] cifs: fix bi-directional fsctl passthrough calls
Date: Tue, 16 Apr 2019 18:01:35 -0500 [thread overview]
Message-ID: <CAH2r5muDm75fSmjG5-5YOKynJRVKKhkecdCLwq_rqgtjzSwCYQ@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 64 bytes --]
Trivial fix up for compile/sparse warning
--
Thanks,
Steve
[-- Attachment #2: 0001-cifs-fix-bi-directional-fsctl-passthrough-calls.patch --]
[-- Type: text/x-patch, Size: 1760 bytes --]
From 2dce1073a0008e46673684cc59b990504fc66235 Mon Sep 17 00:00:00 2001
From: Ronnie Sahlberg <lsahlber@redhat.com>
Date: Mon, 15 Apr 2019 12:13:52 +1000
Subject: [PATCH 1/2] cifs: fix bi-directional fsctl passthrough calls
SMB2 Ioctl responses from servers may respond with both the request blob from
the client followed by the actual reply blob for ioctls that are bi-directional.
In that case we can not assume that the reply blob comes immediately after the
ioctl response structure.
This fixes FSCTLs such as SMB2:FSCTL_QUERY_ALLOCATED_RANGES
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
---
fs/cifs/smb2ops.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 08ff044fbb4b..841ce7e1fb72 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -1462,12 +1462,19 @@ smb2_ioctl_query_info(const unsigned int xid,
io_rsp = (struct smb2_ioctl_rsp *)rsp_iov[1].iov_base;
if (le32_to_cpu(io_rsp->OutputCount) < qi.input_buffer_length)
qi.input_buffer_length = le32_to_cpu(io_rsp->OutputCount);
+ if (qi.input_buffer_length > 0 &&
+ le32_to_cpu(io_rsp->OutputOffset) + qi.input_buffer_length > rsp_iov[1].iov_len) {
+ rc = -EFAULT;
+ goto iqinf_exit;
+ }
if (copy_to_user(&pqi->input_buffer_length, &qi.input_buffer_length,
sizeof(qi.input_buffer_length))) {
rc = -EFAULT;
goto iqinf_exit;
}
- if (copy_to_user(pqi + 1, &io_rsp[1], qi.input_buffer_length)) {
+ if (copy_to_user((void __user *)pqi + sizeof(struct smb_query_info),
+ (const void *)io_rsp + le32_to_cpu(io_rsp->OutputOffset),
+ qi.input_buffer_length)) {
rc = -EFAULT;
goto iqinf_exit;
}
--
2.17.1
next reply other threads:[~2019-04-16 23:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-16 23:01 Steve French [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-04-15 2:13 fix bidirectional fsctl passthrough Ronnie Sahlberg
2019-04-15 2:13 ` [PATCH] cifs: fix bi-directional fsctl passthrough calls Ronnie Sahlberg
2019-04-16 20:30 ` Tom Talpey
2019-04-16 20:41 ` Steve French
2019-04-17 6:36 ` ronnie sahlberg
2019-04-12 3:05 Ronnie Sahlberg
2019-04-12 12:51 ` Tom Talpey
2019-04-12 13:37 ` ronnie sahlberg
2019-04-12 13:53 ` Tom Talpey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAH2r5muDm75fSmjG5-5YOKynJRVKKhkecdCLwq_rqgtjzSwCYQ@mail.gmail.com \
--to=smfrench@gmail.com \
--cc=linux-cifs@vger.kernel.org \
--cc=ronniesahlberg@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).