Skip to content

Commit 27f58c0

Browse files
alexw65500martinkpetersen
authored andcommitted
scsi: sg: Avoid sg device teardown race
sg_remove_sfp_usercontext() must not use sg_device_destroy() after calling scsi_device_put(). sg_device_destroy() is accessing the parent scsi_device request_queue which will already be set to NULL when the preceding call to scsi_device_put() removed the last reference to the parent scsi_device. The resulting NULL pointer exception will then crash the kernel. Link: https://lore.kernel.org/r/[email protected] Fixes: db59133 ("scsi: sg: fix blktrace debugfs entries leakage") Cc: [email protected] Signed-off-by: Alexander Wetzel <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Bart Van Assche <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent f02fe78 commit 27f58c0

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/scsi/sg.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2207,6 +2207,7 @@ sg_remove_sfp_usercontext(struct work_struct *work)
22072207
{
22082208
struct sg_fd *sfp = container_of(work, struct sg_fd, ew.work);
22092209
struct sg_device *sdp = sfp->parentdp;
2210+
struct scsi_device *device = sdp->device;
22102211
Sg_request *srp;
22112212
unsigned long iflags;
22122213

@@ -2232,8 +2233,9 @@ sg_remove_sfp_usercontext(struct work_struct *work)
22322233
"sg_remove_sfp: sfp=0x%p\n", sfp));
22332234
kfree(sfp);
22342235

2235-
scsi_device_put(sdp->device);
2236+
WARN_ON_ONCE(kref_read(&sdp->d_ref) != 1);
22362237
kref_put(&sdp->d_ref, sg_device_destroy);
2238+
scsi_device_put(device);
22372239
module_put(THIS_MODULE);
22382240
}
22392241

0 commit comments

Comments
 (0)