ksmbd: smbd: validate buffer descriptor structures
Subsystems (2)
PATCH v2 1/1 ksmbd: smbd: validate buffer descriptor structures
Check ChannelInfoOffset and ChannelInfoLength
to validate buffer descriptor structures.
And add a debug log to print the structures'
content.
Signed-off-by Hyunchul Lee <[email protected]>
---
changes from v1:
- avoid a loop for printing debug logs.
- print a debug log if the number of buffer descriptors is not 1.
fs/ksmbd/smb2pdu.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-)
fs/ksmbd/smb2pdu.c +30 -6
@@ -6130,13 +6130,26 @@ static int smb2_set_remote_key_for_rdma(struct ksmbd_work *work, __le16 ChannelInfoOffset, __le16 ChannelInfoLength) { +unsigned int i, ch_count; +if (work->conn->dialect ==SMB30_PROT_ID && Channel !=SMB2_CHANNEL_RDMA_V1 )return -EINVAL ; -if (ChannelInfoOffset ==0 || -le16_to_cpu (ChannelInfoLength) <sizeof (*desc)) + ch_count =le16_to_cpu (ChannelInfoLength) /sizeof (*desc); +if (ksmbd_debug_types &KSMBD_DEBUG_RDMA ) { +for (i =0 ; i < ch_count; i++) { +pr_info ("RDMA r/w request %#x: token %#x, length %#x\n" , + i, +le32_to_cpu (desc[i].token), +le32_to_cpu (desc[i].length)); + } + } +if (ch_count !=1 ) { +ksmbd_debug (RDMA ,"RDMA multiple buffer descriptors %d are not supported yet\n" , + ch_count);return -EINVAL ; + } work->need_invalidate_rkey = (Channel ==SMB2_CHANNEL_RDMA_V1_INVALIDATE );
@@ -6189,9 +6202,15 @@ int smb2_read(struct ksmbd_work *work)if (req->Channel ==SMB2_CHANNEL_RDMA_V1_INVALIDATE || req->Channel ==SMB2_CHANNEL_RDMA_V1 ) { +unsigned int ch_offset =le16_to_cpu (req->ReadChannelInfoOffset); + +if (ch_offset < offsetof(struct smb2_read_req , Buffer)) { + err = -EINVAL ; + goto out; + } err =smb2_set_remote_key_for_rdma (work, (struct smb2_buffer_desc_v1 *) - &req->Buffer[0 ], + ((char *)req + ch_offset), req->Channel, req->ReadChannelInfoOffset, req->ReadChannelInfoLength);
@@ -6432,11 +6451,16 @@ int smb2_write(struct ksmbd_work *work)if (req->Channel ==SMB2_CHANNEL_RDMA_V1 || req->Channel ==SMB2_CHANNEL_RDMA_V1_INVALIDATE ) { -if (req->Length !=0 || req->DataOffset !=0 ) -return -EINVAL ; +unsigned int ch_offset =le16_to_cpu (req->WriteChannelInfoOffset); + +if (req->Length !=0 || req->DataOffset !=0 || + ch_offset < offsetof(struct smb2_write_req , Buffer)) { + err = -EINVAL ; + goto out; + } err =smb2_set_remote_key_for_rdma (work, (struct smb2_buffer_desc_v1 *) - &req->Buffer[0 ], + ((char *)req + ch_offset), req->Channel, req->WriteChannelInfoOffset, req->WriteChannelInfoLength);
Signature · 1 line
2.25.1
2022-01-20 21:10 GMT+09:00, Hyunchul Lee <[email protected]>:
Quoted 6 lines
Check ChannelInfoOffset and ChannelInfoLength
to validate buffer descriptor structures.
And add a debug log to print the structures'
content.Signed-off-by Hyunchul Lee <[email protected]>
Acked-by Namjae Jeon <[email protected]>