diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-05 11:28:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-05 11:28:21 -0700 |
| commit | e12d8d512f090b6c540c7f75bf879f0d6a908587 (patch) | |
| tree | 9eeae84e15bec7f4010d07f26b40c5ef2f00cf71 /drivers/scsi/scsi_debug.c | |
| parent | f29b909db9df7e7e0bdd0b2c41e3c9d6c7db41a3 (diff) | |
| parent | 49ce5b5f0371951c3ad751e71a63f487606738c3 (diff) | |
| download | linux-e12d8d512f090b6c540c7f75bf879f0d6a908587.tar.gz linux-e12d8d512f090b6c540c7f75bf879f0d6a908587.tar.bz2 linux-e12d8d512f090b6c540c7f75bf879f0d6a908587.zip | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Two more important data integrity fixes related to RAID device drivers
which wrongly throw away the SYNCHRONIZE CACHE command in the non-RAID
path and a memory leak in the scsi_debug driver"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: arcmsr: Send SYNCHRONIZE_CACHE command to firmware
scsi: scsi_debug: Fix memory leak if LBP enabled and module is unloaded
scsi: megaraid_sas: Fix data integrity failure for JBOD (passthrough) devices
Diffstat (limited to 'drivers/scsi/scsi_debug.c')
| -rw-r--r-- | drivers/scsi/scsi_debug.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index c905709707f0..cf04a364fd8b 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -5134,6 +5134,7 @@ static void __exit scsi_debug_exit(void) bus_unregister(&pseudo_lld_bus); root_device_unregister(pseudo_primary); + vfree(map_storep); vfree(dif_storep); vfree(fake_storep); kfree(sdebug_q_arr); |