Skip to content

Commit ca978f8

Browse files
mjbommarmartinkpetersen
authored andcommitted
scsi: xen: scsiback: Free unsubmitted command instead of double-putting it
scsiback_get_pend_req() obtains a command tag and returns a vscsibk_pend whose embedded se_cmd has only been memset to 0, so its cmd_kref is 0; the se_cmd is initialised (kref_init() via target_init_cmd()) only later, in scsiback_cmd_exec(), on the successful VSCSIIF_ACT_SCSI_CDB path. The two error paths in scsiback_do_cmd_fn() taken before the command is submitted -- a failed scsiback_gnttab_data_map() and an unknown ring_req.act -- call transport_generic_free_cmd(&pending_req->se_cmd, 0), which kref_put()s a refcount of 0. That underflows it ("refcount_t: underflow; use-after-free") and, as the release function is not run, leaks the command tag. Impact: a pvSCSI guest can leak every command tag of a LUN's session, stopping the LUN, by submitting requests with a bad grant reference or an unknown request type; under panic_on_warn the refcount underflow panics the host. Add a helper that just returns the tag with target_free_tag() and sends the error response. It frees the tag while the v2p reference still pins the session, and snapshots the response fields beforehand because freeing the tag can let another ring reuse the pending_req slot. Fixes: 2dbcdf3 ("xen-scsiback: Convert to percpu_ida tag allocation") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Michael Bommarito <michael.bommarito@gmail.com> Reviewed-by: Juergen Gross <jgross@suse.com> Link: https://patch.msgid.link/20260611123046.2323342-2-michael.bommarito@gmail.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent e81f107 commit ca978f8

1 file changed

Lines changed: 22 additions & 6 deletions

File tree

drivers/xen/xen-scsiback.c

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,25 @@ static void scsiback_disconnect(struct vscsibk_info *info)
611611
xenbus_unmap_ring_vfree(info->dev, info->ring.sring);
612612
}
613613

614+
/*
615+
* Send the error response for a request that did not reach the target core
616+
* and return its tag. Free the tag before the response drops the v2p
617+
* reference that keeps the session alive, and snapshot what the response
618+
* needs since returning the tag can let the slot be reused.
619+
*/
620+
static void scsiback_resp_and_free(struct vscsibk_pend *pending_req,
621+
int32_t result)
622+
{
623+
struct vscsibk_info *info = pending_req->info;
624+
struct v2p_entry *v2p = pending_req->v2p;
625+
struct se_session *se_sess = v2p->tpg->tpg_nexus->tvn_se_sess;
626+
u16 rqid = pending_req->rqid;
627+
628+
target_free_tag(se_sess, &pending_req->se_cmd);
629+
scsiback_send_response(info, NULL, result, 0, rqid);
630+
kref_put(&v2p->kref, scsiback_free_translation_entry);
631+
}
632+
614633
static void scsiback_device_action(struct vscsibk_pend *pending_req,
615634
enum tcm_tmreq_table act, int tag)
616635
{
@@ -792,9 +811,8 @@ static int scsiback_do_cmd_fn(struct vscsibk_info *info,
792811
case VSCSIIF_ACT_SCSI_CDB:
793812
if (scsiback_gnttab_data_map(&ring_req, pending_req)) {
794813
scsiback_fast_flush_area(pending_req);
795-
scsiback_do_resp_with_sense(NULL,
796-
DID_ERROR << 16, 0, pending_req);
797-
transport_generic_free_cmd(&pending_req->se_cmd, 0);
814+
scsiback_resp_and_free(pending_req,
815+
DID_ERROR << 16);
798816
} else {
799817
scsiback_cmd_exec(pending_req);
800818
}
@@ -808,9 +826,7 @@ static int scsiback_do_cmd_fn(struct vscsibk_info *info,
808826
break;
809827
default:
810828
pr_err_ratelimited("invalid request\n");
811-
scsiback_do_resp_with_sense(NULL, DID_ERROR << 16, 0,
812-
pending_req);
813-
transport_generic_free_cmd(&pending_req->se_cmd, 0);
829+
scsiback_resp_and_free(pending_req, DID_ERROR << 16);
814830
break;
815831
}
816832

0 commit comments

Comments
 (0)