From: Khazhismel Kumykov <khazhy@chromium.org>
To: Lee Duncan <lduncan@suse.com>, Chris Leech <cleech@redhat.com>,
Mike Christie <michael.christie@oracle.com>
Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
open-iscsi@googlegroups.com, linux-scsi@vger.kernel.org,
linux-kernel@vger.kernel.org,
Khazhismel Kumykov <khazhy@google.com>
Subject: [PATCH v2 2/2] libiscsi: disallow binding an already-bound connection
Date: Thu, 23 May 2024 15:21:28 -0700 [thread overview]
Message-ID: <20240523222128.786137-2-khazhy@google.com> (raw)
In-Reply-To: <20240523222128.786137-1-khazhy@google.com>
This fixes issue where misbehaving userspace initiator could bind the
same connection multiple times, which would leak the old connection
socket without cleaning it up.
For iscsi_tcp, it calls iscsi_suspend_tx directly in stop_conn. Update
this to iscsi_conn_unbind, which matches the lifecycle of other drivers,
and clears the CONN_FLAG_BOUND.
Suggested-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Khazhismel Kumykov <khazhy@google.com>
---
drivers/scsi/iscsi_tcp.c | 2 +-
drivers/scsi/libiscsi.c | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index deb9252e02e6..1d93404515ae 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -696,7 +696,7 @@ static void iscsi_sw_tcp_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
wake_up_interruptible(sk_sleep(sock->sk));
/* stop xmit side */
- iscsi_suspend_tx(conn);
+ iscsi_conn_unbind(cls_conn, true);
/* stop recv side and release socket */
iscsi_sw_tcp_release_conn(conn);
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 0fda8905eabd..0fb98eb53584 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -3453,6 +3453,12 @@ int iscsi_conn_bind(struct iscsi_cls_session *cls_session,
struct iscsi_conn *conn = cls_conn->dd_data;
spin_lock_bh(&session->frwd_lock);
+ if (test_bit(ISCSI_CONN_FLAG_BOUND, &conn->flags)) {
+ spin_unlock_bh(&session->frwd_lock);
+ return -EBUSY;
+ }
+
+
if (is_leading)
session->leadconn = conn;
--
2.45.1.288.g0e0cd299f1-goog
next prev parent reply other threads:[~2024-05-23 22:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-23 22:21 [PATCH v2 1/2] iscsi_tcp: do not bind sockets that already have extra callbacks Khazhismel Kumykov
2024-05-23 22:21 ` Khazhismel Kumykov [this message]
2024-05-24 16:14 ` [PATCH v2 2/2] libiscsi: disallow binding an already-bound connection Mike Christie
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=20240523222128.786137-2-khazhy@google.com \
--to=khazhy@chromium.org \
--cc=cleech@redhat.com \
--cc=jejb@linux.ibm.com \
--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=michael.christie@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).