提交 d3edb864 编写于 作者: H Hyunchul Lee 提交者: Zhong Jinghua

ksmbd: smbd: fix missing client's memory region invalidation

mainline inclusion
from mainline-5.17-rc1
commit 2fd5dcb1
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I60T7G
CVE: NA

Reference: https://git.kernel.org/torvalds/linux/c/2fd5dcb1c8ef

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

if the Channel of a SMB2 WRITE request is
SMB2_CHANNEL_RDMA_V1_INVALIDTE, a client
does not invalidate its memory regions but
ksmbd must do it by sending a SMB2 WRITE response
with IB_WR_SEND_WITH_INV.

But if errors occur while processing a SMB2
READ/WRITE request, ksmbd sends a response
with IB_WR_SEND. So a client could use memory
regions already in use.
Acked-by: NNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: NHyunchul Lee <hyc.lee@gmail.com>
Signed-off-by: NSteve French <stfrench@microsoft.com>
Signed-off-by: NJason Yan <yanaijie@huawei.com>
Signed-off-by: NZhong Jinghua <zhongjinghua@huawei.com>
上级 8ee38b9b
...@@ -6068,25 +6068,33 @@ static noinline int smb2_read_pipe(struct ksmbd_work *work) ...@@ -6068,25 +6068,33 @@ static noinline int smb2_read_pipe(struct ksmbd_work *work)
return err; return err;
} }
static ssize_t smb2_read_rdma_channel(struct ksmbd_work *work, static int smb2_set_remote_key_for_rdma(struct ksmbd_work *work,
struct smb2_read_req *req, void *data_buf, struct smb2_buffer_desc_v1 *desc,
size_t length) __le32 Channel,
__le16 ChannelInfoOffset,
__le16 ChannelInfoLength)
{ {
struct smb2_buffer_desc_v1 *desc =
(struct smb2_buffer_desc_v1 *)&req->Buffer[0];
int err;
if (work->conn->dialect == SMB30_PROT_ID && if (work->conn->dialect == SMB30_PROT_ID &&
req->Channel != SMB2_CHANNEL_RDMA_V1) Channel != SMB2_CHANNEL_RDMA_V1)
return -EINVAL; return -EINVAL;
if (req->ReadChannelInfoOffset == 0 || if (ChannelInfoOffset == 0 ||
le16_to_cpu(req->ReadChannelInfoLength) < sizeof(*desc)) le16_to_cpu(ChannelInfoLength) < sizeof(*desc))
return -EINVAL; return -EINVAL;
work->need_invalidate_rkey = work->need_invalidate_rkey =
(req->Channel == SMB2_CHANNEL_RDMA_V1_INVALIDATE); (Channel == SMB2_CHANNEL_RDMA_V1_INVALIDATE);
work->remote_key = le32_to_cpu(desc->token); work->remote_key = le32_to_cpu(desc->token);
return 0;
}
static ssize_t smb2_read_rdma_channel(struct ksmbd_work *work,
struct smb2_read_req *req, void *data_buf,
size_t length)
{
struct smb2_buffer_desc_v1 *desc =
(struct smb2_buffer_desc_v1 *)&req->Buffer[0];
int err;
err = ksmbd_conn_rdma_write(work->conn, data_buf, length, err = ksmbd_conn_rdma_write(work->conn, data_buf, length,
le32_to_cpu(desc->token), le32_to_cpu(desc->token),
...@@ -6109,7 +6117,7 @@ int smb2_read(struct ksmbd_work *work) ...@@ -6109,7 +6117,7 @@ int smb2_read(struct ksmbd_work *work)
struct ksmbd_conn *conn = work->conn; struct ksmbd_conn *conn = work->conn;
struct smb2_read_req *req; struct smb2_read_req *req;
struct smb2_read_rsp *rsp; struct smb2_read_rsp *rsp;
struct ksmbd_file *fp; struct ksmbd_file *fp = NULL;
loff_t offset; loff_t offset;
size_t length, mincount; size_t length, mincount;
ssize_t nbytes = 0, remain_bytes = 0; ssize_t nbytes = 0, remain_bytes = 0;
...@@ -6123,6 +6131,18 @@ int smb2_read(struct ksmbd_work *work) ...@@ -6123,6 +6131,18 @@ int smb2_read(struct ksmbd_work *work)
return smb2_read_pipe(work); return smb2_read_pipe(work);
} }
if (req->Channel == SMB2_CHANNEL_RDMA_V1_INVALIDATE ||
req->Channel == SMB2_CHANNEL_RDMA_V1) {
err = smb2_set_remote_key_for_rdma(work,
(struct smb2_buffer_desc_v1 *)
&req->Buffer[0],
req->Channel,
req->ReadChannelInfoOffset,
req->ReadChannelInfoLength);
if (err)
goto out;
}
fp = ksmbd_lookup_fd_slow(work, le64_to_cpu(req->VolatileFileId), fp = ksmbd_lookup_fd_slow(work, le64_to_cpu(req->VolatileFileId),
le64_to_cpu(req->PersistentFileId)); le64_to_cpu(req->PersistentFileId));
if (!fp) { if (!fp) {
...@@ -6308,21 +6328,6 @@ static ssize_t smb2_write_rdma_channel(struct ksmbd_work *work, ...@@ -6308,21 +6328,6 @@ static ssize_t smb2_write_rdma_channel(struct ksmbd_work *work,
desc = (struct smb2_buffer_desc_v1 *)&req->Buffer[0]; desc = (struct smb2_buffer_desc_v1 *)&req->Buffer[0];
if (work->conn->dialect == SMB30_PROT_ID &&
req->Channel != SMB2_CHANNEL_RDMA_V1)
return -EINVAL;
if (req->Length != 0 || req->DataOffset != 0)
return -EINVAL;
if (req->WriteChannelInfoOffset == 0 ||
le16_to_cpu(req->WriteChannelInfoLength) < sizeof(*desc))
return -EINVAL;
work->need_invalidate_rkey =
(req->Channel == SMB2_CHANNEL_RDMA_V1_INVALIDATE);
work->remote_key = le32_to_cpu(desc->token);
data_buf = kvmalloc(length, GFP_KERNEL | __GFP_ZERO); data_buf = kvmalloc(length, GFP_KERNEL | __GFP_ZERO);
if (!data_buf) if (!data_buf)
return -ENOMEM; return -ENOMEM;
...@@ -6369,6 +6374,20 @@ int smb2_write(struct ksmbd_work *work) ...@@ -6369,6 +6374,20 @@ int smb2_write(struct ksmbd_work *work)
return smb2_write_pipe(work); return smb2_write_pipe(work);
} }
if (req->Channel == SMB2_CHANNEL_RDMA_V1 ||
req->Channel == SMB2_CHANNEL_RDMA_V1_INVALIDATE) {
if (req->Length != 0 || req->DataOffset != 0)
return -EINVAL;
err = smb2_set_remote_key_for_rdma(work,
(struct smb2_buffer_desc_v1 *)
&req->Buffer[0],
req->Channel,
req->WriteChannelInfoOffset,
req->WriteChannelInfoLength);
if (err)
goto out;
}
if (!test_tree_conn_flag(work->tcon, KSMBD_TREE_CONN_FLAG_WRITABLE)) { if (!test_tree_conn_flag(work->tcon, KSMBD_TREE_CONN_FLAG_WRITABLE)) {
ksmbd_debug(SMB, "User does not have write permission\n"); ksmbd_debug(SMB, "User does not have write permission\n");
err = -EACCES; err = -EACCES;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册