From: Mike Christie <michael.christie@oracle.com>
To: Khazhismel Kumykov <khazhy@chromium.org>,
Lee Duncan <lduncan@suse.com>, Chris Leech <cleech@redhat.com>,
"James E . J . Bottomley" <jejb@linux.ibm.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>
Cc: open-iscsi@googlegroups.com, linux-scsi@vger.kernel.org,
linux-kernel@vger.kernel.org,
Khazhismel Kumykov <khazhy@google.com>
Subject: Re: [PATCH 1/2] iscsi_tcp: do not bind sockets that already have extra callbacks
Date: Tue, 19 Mar 2024 14:28:52 -0500 [thread overview]
Message-ID: <3abd7f0b-dc88-4183-8762-f2f101402edd@oracle.com> (raw)
In-Reply-To: <20240318194902.3290795-1-khazhy@google.com>
On 3/18/24 2:49 PM, Khazhismel Kumykov wrote:
> This attempts to avoid a situation where a misbehaving iscsi daemon
> passes a socket for a different iSCSI connection to BIND_CONN - which
> would result in infinite recursion and stack overflow. This will
> also prevent passing *other* sockets which had sk_user_data overridden,
> but that wouldn't have been safe anyways - since we throw away that
> pointer anyways. This does not cover all hypothetical scenarios where we
> pass bad sockets to BIND_CONN.
>
> This also papers over a different bug - we allow a daemon to call
> BIND_CONN twice for the same connection - which would result in, at the
> least, failing to uninitialize/teardown the previous socket, which will
> be addressed separately.
>
> Signed-off-by: Khazhismel Kumykov <khazhy@google.com>
> ---
> drivers/scsi/iscsi_tcp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
> index 8e14cea15f98..e8ed60b777c6 100644
> --- a/drivers/scsi/iscsi_tcp.c
> +++ b/drivers/scsi/iscsi_tcp.c
> @@ -725,7 +725,7 @@ iscsi_sw_tcp_conn_bind(struct iscsi_cls_session *cls_session,
> }
>
> err = -EINVAL;
> - if (!sk_is_tcp(sock->sk))
> + if (!sk_is_tcp(sock->sk) || sock->sk->sk_user_data)
> goto free_socket;
>
> err = iscsi_conn_bind(cls_session, cls_conn, is_leading);
Reviewed-by: Mike Christie <michael.christie@oracle.com>
prev parent reply other threads:[~2024-03-19 19:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-18 19:49 [PATCH 1/2] iscsi_tcp: do not bind sockets that already have extra callbacks Khazhismel Kumykov
2024-03-18 19:49 ` [PATCH 2/2] iscsi_tcp: disallow binding the same connection twice Khazhismel Kumykov
2024-03-19 19:33 ` Mike Christie
2024-05-23 22:25 ` Khazhy Kumykov
2024-03-19 19:28 ` Mike Christie [this message]
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=3abd7f0b-dc88-4183-8762-f2f101402edd@oracle.com \
--to=michael.christie@oracle.com \
--cc=cleech@redhat.com \
--cc=jejb@linux.ibm.com \
--cc=khazhy@chromium.org \
--cc=khazhy@google.com \
--cc=lduncan@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=open-iscsi@googlegroups.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).