From: Mike Christie <mchristi@redhat.com>
To: target-devel@vger.kernel.org
Subject: Re: [PATCH 2/3] target: fix SendTargets=All string compares
Date: Wed, 02 Oct 2019 17:09:38 +0000 [thread overview]
Message-ID: <5D94D9D2.7030709@redhat.com> (raw)
In-Reply-To: <20190912095547.22427-3-ddiss@suse.de>
On 09/12/2019 04:55 AM, David Disseldorp wrote:
> strncmp is currently used for "SendTargets" key and "All" value matching
> without checking for trailing garbage. This means that Text request PDUs
> with garbage such as "SendTargetsPlease=All" and "SendTargets=Alle" are
> processed successfully as if they were "SendTargets=All" requests.
>
> Signed-off-by: David Disseldorp <ddiss@suse.de>
> ---
> drivers/target/iscsi/iscsi_target.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
> index d19e051f2bc2..09e55ea0bf5d 100644
> --- a/drivers/target/iscsi/iscsi_target.c
> +++ b/drivers/target/iscsi/iscsi_target.c
> @@ -2189,24 +2189,22 @@ iscsit_process_text_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
> }
> goto empty_sendtargets;
> }
> - if (strncmp("SendTargets", text_in, 11) != 0) {
> + if (strncmp("SendTargets=", text_in, 12) != 0) {
> pr_err("Received Text Data that is not"
> " SendTargets, cannot continue.\n");
> goto reject;
> }
> + /* '=' confirmed in strncmp */
> text_ptr = strchr(text_in, '=');
> - if (!text_ptr) {
> - pr_err("No \"=\" separator found in Text Data,"
> - " cannot continue.\n");
> - goto reject;
> - }
> - if (!strncmp("=All", text_ptr, 4)) {
> + BUG_ON(!text_ptr);
> + if (!strncmp("=All", text_ptr, 5)) {
Why is the count 5 now?
Did the ones below need to be increased too then?
> cmd->cmd_flags |= ICF_SENDTARGETS_ALL;
> } else if (!strncmp("=iqn.", text_ptr, 5) ||
> !strncmp("=eui.", text_ptr, 5)) {
> cmd->cmd_flags |= ICF_SENDTARGETS_SINGLE;
> } else {
> - pr_err("Unable to locate valid SendTargets=%s value\n", text_ptr);
> + pr_err("Unable to locate valid SendTargets%s value\n",
> + text_ptr);
> goto reject;
> }
>
>
next prev parent reply other threads:[~2019-10-02 17:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-12 9:55 [PATCH 2/3] target: fix SendTargets=All string compares David Disseldorp
2019-10-02 17:09 ` Mike Christie [this message]
2019-10-21 3:18 ` David Disseldorp
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=5D94D9D2.7030709@redhat.com \
--to=mchristi@redhat.com \
--cc=target-devel@vger.kernel.org \
/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