[PATCH] scsi: cxgbi: fix retry_timer use-after-free on adapter detach
Fan Wu <[email protected]> Wed, 5 Aug 2026 01:32:09 +0000
| Newsgroups | gmane.linux.kernel.stable,gmane.linux.scsi,gmane.linux.kernel |
|---|---|
| Message-ID | <[email protected]> |
An active-open connection may keep retry_timer armed because
cxgbi_sock_closed() returns early in CTP_ACTIVE_OPEN state. On adapter
detach, the timer callback can then dereference csk->cdev after cdev has
been freed.
Set CTPF_OFFLOAD_DOWN under csk->lock during portmap cleanup, reject new
retry_timer arming, and make an already queued callback return without
dereferencing csk->cdev. timer_delete_sync() then drains a pending or
running callback before the final cxgbi_sock_put().
This issue was found by an in-house static analysis tool.
Fixes: 7b36b6e03b0d ("[SCSI] cxgb4i v5: iscsi driver")
Cc: [email protected]
Assisted-by: Codex:gpt-5.6
Signed-off-by: Fan Wu <[email protected]>
---
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 8 +++++++-
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 16 +++++++++++++---
drivers/scsi/cxgbi/libcxgbi.c | 1 +
3 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
index 69de965..f61f280 100644
--- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
+++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
@@ -556,6 +556,11 @@ static void act_open_retry_timer(struct timer_list *t)
cxgbi_sock_get(csk);
spin_lock_bh(&csk->lock);
+ if (cxgbi_sock_flag(csk, CTPF_OFFLOAD_DOWN)) {
+ spin_unlock_bh(&csk->lock);
+ cxgbi_sock_put(csk);
+ return;
+ }
skb = alloc_wr(sizeof(struct cpl_act_open_req), 0, GFP_ATOMIC);
if (!skb)
cxgbi_sock_fail_act_open(csk, -ENOMEM);
@@ -585,7 +590,8 @@ static int do_act_open_rpl(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
cxgbi_sock_get(csk);
spin_lock_bh(&csk->lock);
- if (rpl->status == CPL_ERR_CONN_EXIST &&
+ if (!cxgbi_sock_flag(csk, CTPF_OFFLOAD_DOWN) &&
+ rpl->status == CPL_ERR_CONN_EXIST &&
csk->retry_timer.function != act_open_retry_timer) {
csk->retry_timer.function = act_open_retry_timer;
mod_timer(&csk->retry_timer, jiffies + HZ / 2);
diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
index 4267662..3e80345 100644
--- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
+++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
@@ -989,10 +989,10 @@ static void csk_act_open_retry_timer(struct timer_list *t)
{
struct sk_buff *skb = NULL;
struct cxgbi_sock *csk = timer_container_of(csk, t, retry_timer);
- struct cxgb4_lld_info *lldi = cxgbi_cdev_priv(csk->cdev);
+ struct cxgb4_lld_info *lldi;
void (*send_act_open_func)(struct cxgbi_sock *, struct sk_buff *,
struct l2t_entry *);
- int t4 = is_t4(lldi->adapter_type), size, size6;
+ int t4, size, size6;
log_debug(1 << CXGBI_DBG_TOE | 1 << CXGBI_DBG_SOCK,
"csk 0x%p,%u,0x%lx,%u.\n",
@@ -1001,6 +1001,15 @@ static void csk_act_open_retry_timer(struct timer_list *t)
cxgbi_sock_get(csk);
spin_lock_bh(&csk->lock);
+ if (cxgbi_sock_flag(csk, CTPF_OFFLOAD_DOWN)) {
+ spin_unlock_bh(&csk->lock);
+ cxgbi_sock_put(csk);
+ return;
+ }
+
+ lldi = cxgbi_cdev_priv(csk->cdev);
+ t4 = is_t4(lldi->adapter_type);
+
if (t4) {
size = sizeof(struct cpl_act_open_req);
size6 = sizeof(struct cpl_act_open_req6);
@@ -1075,7 +1084,8 @@ static void do_act_open_rpl(struct cxgbi_device *cdev, struct sk_buff *skb)
cxgbi_sock_get(csk);
spin_lock_bh(&csk->lock);
- if (status == CPL_ERR_CONN_EXIST &&
+ if (!cxgbi_sock_flag(csk, CTPF_OFFLOAD_DOWN) &&
+ status == CPL_ERR_CONN_EXIST &&
csk->retry_timer.function != csk_act_open_retry_timer) {
csk->retry_timer.function = csk_act_open_retry_timer;
mod_timer(&csk->retry_timer, jiffies + HZ / 2);
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
index ea9631b..76dd1e3 100644
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -109,6 +109,7 @@ void cxgbi_device_portmap_cleanup(struct cxgbi_device *cdev)
cxgbi_sock_set_flag(csk, CTPF_OFFLOAD_DOWN);
cxgbi_sock_closed(csk);
spin_unlock_bh(&csk->lock);
+ timer_delete_sync(&csk->retry_timer);
cxgbi_sock_put(csk);
}
}
--
2.34.1