ksmbd: smbd: fix missing client's memory region invalidation
Subsystems (2)
PATCH v2 1/1 ksmbd: smbd: fix missing client's memory region invalidation
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.
---
changes from v1:
- factor out setting a remote key to a helper functions.
fs/ksmbd/smb2pdu.c | 58 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 14 deletions(-)
fs/ksmbd/smb2pdu.c +44 -14
@@ -6124,13 +6124,11 @@ static noinline int smb2_read_pipe(struct ksmbd_work *work)return err; } -static ssize_t smb2_read_rdma_channel (struct ksmbd_work *work, -struct smb2_read_req *req,void *data_buf, -size_t length) +static int smb2_set_remote_key_for_rdma_read (struct ksmbd_work *work, +struct smb2_read_req *req) {struct smb2_buffer_desc_v1 *desc = (struct smb2_buffer_desc_v1 *)&req->Buffer[0 ]; -int err;if (work->conn->dialect ==SMB30_PROT_ID && req->Channel !=SMB2_CHANNEL_RDMA_V1 )
@@ -6143,6 +6141,16 @@ static ssize_t smb2_read_rdma_channel(struct ksmbd_work *work, work->need_invalidate_rkey = (req->Channel ==SMB2_CHANNEL_RDMA_V1_INVALIDATE ); 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, le32_to_cpu(desc->token),
@@ -6179,6 +6187,13 @@ int smb2_read(struct ksmbd_work *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_read (work, req); +if (err) + goto out; + } + fp =ksmbd_lookup_fd_slow (work,le64_to_cpu (req->VolatileFileId),le64_to_cpu (req->PersistentFileId));if (!fp) {
@@ -6352,17 +6367,11 @@ static noinline int smb2_write_pipe(struct ksmbd_work *work)return err; } -static ssize_t smb2_write_rdma_channel (struct ksmbd_work *work, -struct smb2_write_req *req, -struct ksmbd_file *fp, -loff_t offset,size_t length,bool sync) +static int smb2_set_remote_key_for_rdma_write (struct ksmbd_work *work, +struct smb2_write_req *req) { -struct smb2_buffer_desc_v1 *desc; -char *data_buf; -int ret; -ssize_t nbytes; - - desc = (struct smb2_buffer_desc_v1 *)&req->Buffer[0 ]; +struct smb2_buffer_desc_v1 *desc = + (struct smb2_buffer_desc_v1 *)&req->Buffer[0 ];if (work->conn->dialect ==SMB30_PROT_ID && req->Channel !=SMB2_CHANNEL_RDMA_V1 )
@@ -6378,6 +6387,20 @@ static ssize_t smb2_write_rdma_channel(struct ksmbd_work *work, work->need_invalidate_rkey = (req->Channel ==SMB2_CHANNEL_RDMA_V1_INVALIDATE ); work->remote_key =le32_to_cpu (desc->token); +return 0 ; +} + +static ssize_t smb2_write_rdma_channel (struct ksmbd_work *work, +struct smb2_write_req *req, +struct ksmbd_file *fp, +loff_t offset,size_t length,bool sync) +{ +struct smb2_buffer_desc_v1 *desc; +char *data_buf; +int ret; +ssize_t nbytes; + + desc = (struct smb2_buffer_desc_v1 *)&req->Buffer[0 ]; data_buf =kvmalloc (length,GFP_KERNEL | __GFP_ZERO);if (!data_buf)
@@ -6425,6 +6448,13 @@ int smb2_write(struct ksmbd_work *work)return smb2_write_pipe (work); } +if (req->Channel ==SMB2_CHANNEL_RDMA_V1 || + req->Channel ==SMB2_CHANNEL_RDMA_V1_INVALIDATE ) { + err =smb2_set_remote_key_for_rdma_write (work, req); +if (err) + goto out; + } +if (!test_tree_conn_flag (work->tcon,KSMBD_TREE_CONN_FLAG_WRITABLE )) {ksmbd_debug (SMB ,"User does not have write permission\n" ); err = -EACCES ;
Signature · 1 line
2.25.1
Namjae Jeon
maintainer2022-01-11 20:57 GMT+09:00, Hyunchul Lee <[email protected]>:
Quoted 11 lines
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 withIB_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.
Quoted 4 lines
Signed-off-by Hyunchul Lee <[email protected]>---
changes from v1:
- factor out setting a remote key to a helper functions.
Can we make it as one helper function if desc, Channel, ChannelInfoOffset, ChannelInfoLength are given as arguments?
Quoted 9 lines
fs/ksmbd/smb2pdu.c | 58 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 14 deletions(-)fs/ksmbd/smb2pdu.c +0
-0
fs/ksmbd/smb2pdu.c static noinline int smb2_read_pipe(struct ksmbd_work · line 6129
Quoted 9 lines
fs/ksmbd/smb2pdu.c +2
-3@@ -6124,13 +6124,11 @@ static noinline int smb2_read_pipe(struct ksmbd_work *work)return err; } -static ssize_t smb2_read_rdma_channel (struct ksmbd_work *work, -struct smb2_read_req *req,void *data_buf, -size_t length) +static int smb2_set_remote_key_for_rdma_read (struct ksmbd_work *work, +struct smb2_read_req *req)
Can we make it as one helper function if desc, Channel, ChannelInfoOffset, ChannelInfoLength are given as arguments? i.e. smb2_set_remote_key_for_rdma().
Quoted 102 lines
fs/ksmbd/smb2pdu.c +0
-1{struct smb2_buffer_desc_v1 *desc = (struct smb2_buffer_desc_v1 *)&req->Buffer[0 ]; -int err; if (work->conn->dialect == SMB30_PROT_ID &&fs/ksmbd/smb2pdu.c +10
-0req->Channel != SMB2_CHANNEL_RDMA_V1)@@ -6143,6 +6141,16 @@ static ssize_t smb2_read_rdma_channel(struct ksmbd_work *work, work->need_invalidate_rkey = (req->Channel ==SMB2_CHANNEL_RDMA_V1_INVALIDATE ); 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,fs/ksmbd/smb2pdu.c +11
-10le32_to_cpu(desc->token),@@ -6179,6 +6187,13 @@ int smb2_read(struct ksmbd_work *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_read (work, req); +if (err) + goto out; + } + fp =ksmbd_lookup_fd_slow (work,le64_to_cpu (req->VolatileFileId),le64_to_cpu (req->PersistentFileId));if (!fp) {@@ -6352,17 +6367,11 @@ static noinline int smb2_write_pipe(struct ksmbd_work *work)return err; } -static ssize_t smb2_write_rdma_channel (struct ksmbd_work *work, -struct smb2_write_req *req, -struct ksmbd_file *fp, -loff_t offset,size_t length,bool sync) +static int smb2_set_remote_key_for_rdma_write (struct ksmbd_work *work, +struct smb2_write_req *req) { -struct smb2_buffer_desc_v1 *desc; -char *data_buf; -int ret; -ssize_t nbytes; - - desc = (struct smb2_buffer_desc_v1 *)&req->Buffer[0 ]; +struct smb2_buffer_desc_v1 *desc = + (struct smb2_buffer_desc_v1 *)&req->Buffer[0 ]; if (work->conn->dialect == SMB30_PROT_ID &&fs/ksmbd/smb2pdu.c +14
-0req->Channel != SMB2_CHANNEL_RDMA_V1)@@ -6378,6 +6387,20 @@ static ssize_t smb2_write_rdma_channel(struct ksmbd_work *work, work->need_invalidate_rkey = (req->Channel ==SMB2_CHANNEL_RDMA_V1_INVALIDATE ); work->remote_key =le32_to_cpu (desc->token); +return 0 ; +} + +static ssize_t smb2_write_rdma_channel (struct ksmbd_work *work, +struct smb2_write_req *req, +struct ksmbd_file *fp, +loff_t offset,size_t length,bool sync) +{ +struct smb2_buffer_desc_v1 *desc; +char *data_buf; +int ret; +ssize_t nbytes; + + desc = (struct smb2_buffer_desc_v1 *)&req->Buffer[0 ]; data_buf =kvmalloc (length,GFP_KERNEL | __GFP_ZERO);fs/ksmbd/smb2pdu.c +7
-1if (!data_buf)@@ -6425,6 +6448,13 @@ int smb2_write(struct ksmbd_work *work)return smb2_write_pipe (work); } +if (req->Channel ==SMB2_CHANNEL_RDMA_V1 || + req->Channel ==SMB2_CHANNEL_RDMA_V1_INVALIDATE ) { + err =smb2_set_remote_key_for_rdma_write (work, req); +if (err) + goto out; + } +if (!test_tree_conn_flag (work->tcon,KSMBD_TREE_CONN_FLAG_WRITABLE )) {ksmbd_debug (SMB ,"User does not have write permission\n" ); err = -EACCES ; --2.25.1
2022년 1월 11일 (화) 오후 10:21, Namjae Jeon <[email protected]>님이 작성:
Quoted 13 lines
2022-01-11 20:57 GMT+09:00, Hyunchul Lee <[email protected]>:
Quoted 11 lines
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 withIB_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.
Quoted 7 lines
Quoted 4 lines
Signed-off-by Hyunchul Lee <[email protected]>---
changes from v1:
- factor out setting a remote key to a helper functions.Can we make it as one helper function if desc, Channel, ChannelInfoOffset, ChannelInfoLength are given as arguments?
Okay, I will change it.
Quoted 124 lines
Quoted 9 lines
fs/ksmbd/smb2pdu.c | 58 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 14 deletions(-)fs/ksmbd/smb2pdu.c +0
-0fs/ksmbd/smb2pdu.c static noinline int smb2_read_pipe(struct ksmbd_work · line 6129
Quoted 9 lines
fs/ksmbd/smb2pdu.c +2
-3@@ -6124,13 +6124,11 @@ static noinline int smb2_read_pipe(struct ksmbd_work *work)return err; } -static ssize_t smb2_read_rdma_channel (struct ksmbd_work *work, -struct smb2_read_req *req,void *data_buf, -size_t length) +static int smb2_set_remote_key_for_rdma_read (struct ksmbd_work *work, +struct smb2_read_req *req)Can we make it as one helper function if desc, Channel, ChannelInfoOffset, ChannelInfoLength are given as arguments? i.e.
smb2_set_remote_key_for_rdma().Quoted 102 lines
fs/ksmbd/smb2pdu.c +0
-1{struct smb2_buffer_desc_v1 *desc = (struct smb2_buffer_desc_v1 *)&req->Buffer[0 ]; -int err; if (work->conn->dialect == SMB30_PROT_ID &&req->Channel != SMB2_CHANNEL_RDMA_V1)fs/ksmbd/smb2pdu.c +10
-0@@ -6143,6 +6141,16 @@ static ssize_t smb2_read_rdma_channel(struct ksmbd_work *work, work->need_invalidate_rkey = (req->Channel ==SMB2_CHANNEL_RDMA_V1_INVALIDATE ); 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,le32_to_cpu(desc->token),fs/ksmbd/smb2pdu.c +11
-10@@ -6179,6 +6187,13 @@ int smb2_read(struct ksmbd_work *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_read (work, req); +if (err) + goto out; + } + fp =ksmbd_lookup_fd_slow (work,le64_to_cpu (req->VolatileFileId),le64_to_cpu (req->PersistentFileId));if (!fp) {@@ -6352,17 +6367,11 @@ static noinline int smb2_write_pipe(struct ksmbd_work *work)return err; } -static ssize_t smb2_write_rdma_channel (struct ksmbd_work *work, -struct smb2_write_req *req, -struct ksmbd_file *fp, -loff_t offset,size_t length,bool sync) +static int smb2_set_remote_key_for_rdma_write (struct ksmbd_work *work, +struct smb2_write_req *req) { -struct smb2_buffer_desc_v1 *desc; -char *data_buf; -int ret; -ssize_t nbytes; - - desc = (struct smb2_buffer_desc_v1 *)&req->Buffer[0 ]; +struct smb2_buffer_desc_v1 *desc = + (struct smb2_buffer_desc_v1 *)&req->Buffer[0 ]; if (work->conn->dialect == SMB30_PROT_ID &&req->Channel != SMB2_CHANNEL_RDMA_V1)fs/ksmbd/smb2pdu.c +14
-0@@ -6378,6 +6387,20 @@ static ssize_t smb2_write_rdma_channel(struct ksmbd_work *work, work->need_invalidate_rkey = (req->Channel ==SMB2_CHANNEL_RDMA_V1_INVALIDATE ); work->remote_key =le32_to_cpu (desc->token); +return 0 ; +} + +static ssize_t smb2_write_rdma_channel (struct ksmbd_work *work, +struct smb2_write_req *req, +struct ksmbd_file *fp, +loff_t offset,size_t length,bool sync) +{ +struct smb2_buffer_desc_v1 *desc; +char *data_buf; +int ret; +ssize_t nbytes; + + desc = (struct smb2_buffer_desc_v1 *)&req->Buffer[0 ]; data_buf =kvmalloc (length,GFP_KERNEL | __GFP_ZERO);if (!data_buf)fs/ksmbd/smb2pdu.c +7
-1@@ -6425,6 +6448,13 @@ int smb2_write(struct ksmbd_work *work)return smb2_write_pipe (work); } +if (req->Channel ==SMB2_CHANNEL_RDMA_V1 || + req->Channel ==SMB2_CHANNEL_RDMA_V1_INVALIDATE ) { + err =smb2_set_remote_key_for_rdma_write (work, req); +if (err) + goto out; + } +if (!test_tree_conn_flag (work->tcon,KSMBD_TREE_CONN_FLAG_WRITABLE )) {ksmbd_debug (SMB ,"User does not have write permission\n" ); err = -EACCES ; --2.25.1
Signature · 2 lines
Thanks, Hyunchul