From: Namjae Jeon <linkinjeon@kernel.org>
To: Marios Makassikis <mmakassikis@freebox.fr>
Cc: linux-cifs@vger.kernel.org
Subject: Re: [PATCH] ksmbd: send proper error response in smb2_tree_connect()
Date: Fri, 23 Dec 2022 13:21:01 +0900 [thread overview]
Message-ID: <CAKYAXd_SLXF664ajnNEVxkx-BOSk7M-JXAn_w-_SuoTjfZtH1A@mail.gmail.com> (raw)
In-Reply-To: <20221222104701.717586-1-mmakassikis@freebox.fr>
2022-12-22 19:47 GMT+09:00, Marios Makassikis <mmakassikis@freebox.fr>:
Hi Marios,
> Currently, smb2_tree_connect doesn't send an error response packet on
> error.
>
> This causes libsmb2 to skip the specific error code and fail with the
> following:
> smb2_service failed with : Failed to parse fixed part of command
> payload. Unexpected size of Error reply. Expected 9, got 8
>
> Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
> ---
> fs/ksmbd/smb2pdu.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
> index 14d7f3599c63..bd2ff9ffa965 100644
> --- a/fs/ksmbd/smb2pdu.c
> +++ b/fs/ksmbd/smb2pdu.c
> @@ -1882,12 +1882,14 @@ int smb2_tree_connect(struct ksmbd_work *work)
> if (IS_ERR(treename)) {
> pr_err("treename is NULL\n");
> status.ret = KSMBD_TREE_CONN_STATUS_ERROR;
> + smb2_set_err_rsp(work);
> goto out_err1;
> }
>
> name = ksmbd_extract_sharename(conn->um, treename);
> if (IS_ERR(name)) {
> status.ret = KSMBD_TREE_CONN_STATUS_ERROR;
> + smb2_set_err_rsp(work);
> goto out_err1;
> }
>
> @@ -1895,10 +1897,12 @@ int smb2_tree_connect(struct ksmbd_work *work)
> name, treename);
>
> status = ksmbd_tree_conn_connect(conn, sess, name);
> - if (status.ret == KSMBD_TREE_CONN_STATUS_OK)
> + if (status.ret == KSMBD_TREE_CONN_STATUS_OK) {
> rsp->hdr.Id.SyncId.TreeId = cpu_to_le32(status.tree_conn->id);
> - else
> + } else {
> + smb2_set_err_rsp(work);
> goto out_err1;
> + }
>
> share = status.tree_conn->share_conf;
> if (test_share_config_flag(share, KSMBD_SHARE_FLAG_PIPE)) {
> @@ -1928,13 +1932,13 @@ int smb2_tree_connect(struct ksmbd_work *work)
> if (conn->posix_ext_supported)
> status.tree_conn->posix_extensions = true;
>
> -out_err1:
> rsp->StructureSize = cpu_to_le16(16);
> + inc_rfc1001_len(work->response_buf, 16);
> +out_err1:
> rsp->Capabilities = 0;
> rsp->Reserved = 0;
> /* default manual caching */
> rsp->ShareFlags = SMB2_SHAREFLAG_MANUAL_CACHING;
> - inc_rfc1001_len(work->response_buf, 16);
>
> if (!IS_ERR(treename))
> kfree(treename);
How about moving smb2_set_err_rsp() to the end of this function to simplify?
@@ -1987,6 +1987,9 @@ out_err1:
rsp->hdr.Status = STATUS_ACCESS_DENIED;
}
+ if (status.ret != KSMBD_TREE_CONN_STATUS_OK)
+ smb2_set_err_rsp(work);
+
return rc;
}
> --
> 2.25.1
>
>
next prev parent reply other threads:[~2022-12-23 4:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-22 10:47 [PATCH] ksmbd: send proper error response in smb2_tree_connect() Marios Makassikis
2022-12-23 4:21 ` Namjae Jeon [this message]
2022-12-23 10:59 ` [PATCH v2] " Marios Makassikis
2022-12-27 15:05 ` Namjae Jeon
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=CAKYAXd_SLXF664ajnNEVxkx-BOSk7M-JXAn_w-_SuoTjfZtH1A@mail.gmail.com \
--to=linkinjeon@kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=mmakassikis@freebox.fr \
/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).