| Message ID | 20210930012108.12396-1-linkinjeon@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] ksmbd: fix transform header validation | expand |
Looks good to me. Acked-by: Hyunchul Lee <hyc.lee@gmail.com> 2021년 9월 30일 (목) 오전 10:22, Namjae Jeon <linkinjeon@kernel.org>님이 작성: > > Validate that the transform and smb request headers are present > before checking OriginalMessageSize and SessionId fields. > > Cc: Ronnie Sahlberg <ronniesahlberg@gmail.com> > Cc: Ralph Böhme <slow@samba.org> > Cc: Steve French <smfrench@gmail.com> > Cc: Sergey Senozhatsky <senozhatsky@chromium.org> > Cc: Hyunchul Lee <hyc.lee@gmail.com> > Reviewed-By: Tom Talpey <tom@talpey.com> > Signed-off-by: Namjae Jeon <linkinjeon@kernel.org> > --- > v2: > - reword patch description. > > fs/ksmbd/smb2pdu.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c > index ec05d9dc6436..b06361313889 100644 > --- a/fs/ksmbd/smb2pdu.c > +++ b/fs/ksmbd/smb2pdu.c > @@ -8455,16 +8455,8 @@ int smb3_decrypt_req(struct ksmbd_work *work) > unsigned int buf_data_size = pdu_length + 4 - > sizeof(struct smb2_transform_hdr); > struct smb2_transform_hdr *tr_hdr = (struct smb2_transform_hdr *)buf; > - unsigned int orig_len = le32_to_cpu(tr_hdr->OriginalMessageSize); > int rc = 0; > > - sess = ksmbd_session_lookup_all(conn, le64_to_cpu(tr_hdr->SessionId)); > - if (!sess) { > - pr_err("invalid session id(%llx) in transform header\n", > - le64_to_cpu(tr_hdr->SessionId)); > - return -ECONNABORTED; > - } > - > if (pdu_length + 4 < > sizeof(struct smb2_transform_hdr) + sizeof(struct smb2_hdr)) { > pr_err("Transform message is too small (%u)\n", > @@ -8472,11 +8464,19 @@ int smb3_decrypt_req(struct ksmbd_work *work) > return -ECONNABORTED; > } > > - if (pdu_length + 4 < orig_len + sizeof(struct smb2_transform_hdr)) { > + if (pdu_length + 4 < > + le32_to_cpu(tr_hdr->OriginalMessageSize) + sizeof(struct smb2_transform_hdr)) { > pr_err("Transform message is broken\n"); > return -ECONNABORTED; > } > > + sess = ksmbd_session_lookup_all(conn, le64_to_cpu(tr_hdr->SessionId)); > + if (!sess) { > + pr_err("invalid session id(%llx) in transform header\n", > + le64_to_cpu(tr_hdr->SessionId)); > + return -ECONNABORTED; > + } > + > iov[0].iov_base = buf; > iov[0].iov_len = sizeof(struct smb2_transform_hdr); > iov[1].iov_base = buf + sizeof(struct smb2_transform_hdr); > -- > 2.25.1 >
diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c index ec05d9dc6436..b06361313889 100644 --- a/fs/ksmbd/smb2pdu.c +++ b/fs/ksmbd/smb2pdu.c @@ -8455,16 +8455,8 @@ int smb3_decrypt_req(struct ksmbd_work *work) unsigned int buf_data_size = pdu_length + 4 - sizeof(struct smb2_transform_hdr); struct smb2_transform_hdr *tr_hdr = (struct smb2_transform_hdr *)buf; - unsigned int orig_len = le32_to_cpu(tr_hdr->OriginalMessageSize); int rc = 0; - sess = ksmbd_session_lookup_all(conn, le64_to_cpu(tr_hdr->SessionId)); - if (!sess) { - pr_err("invalid session id(%llx) in transform header\n", - le64_to_cpu(tr_hdr->SessionId)); - return -ECONNABORTED; - } - if (pdu_length + 4 < sizeof(struct smb2_transform_hdr) + sizeof(struct smb2_hdr)) { pr_err("Transform message is too small (%u)\n", @@ -8472,11 +8464,19 @@ int smb3_decrypt_req(struct ksmbd_work *work) return -ECONNABORTED; } - if (pdu_length + 4 < orig_len + sizeof(struct smb2_transform_hdr)) { + if (pdu_length + 4 < + le32_to_cpu(tr_hdr->OriginalMessageSize) + sizeof(struct smb2_transform_hdr)) { pr_err("Transform message is broken\n"); return -ECONNABORTED; } + sess = ksmbd_session_lookup_all(conn, le64_to_cpu(tr_hdr->SessionId)); + if (!sess) { + pr_err("invalid session id(%llx) in transform header\n", + le64_to_cpu(tr_hdr->SessionId)); + return -ECONNABORTED; + } + iov[0].iov_base = buf; iov[0].iov_len = sizeof(struct smb2_transform_hdr); iov[1].iov_base = buf + sizeof(struct smb2_transform_hdr);