Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Two fairly small fixes: the qla one is a panic inducing use after free
and the entropy fix may seem minor but it has had huge userspace
impact thanks to an unrelated change in openssl that causes sshd to
refuse logins until it has enough entropy for the session keys, which
causes tens of minutes delay before the affected systems allow logins
after reboot"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: qla2xxx: Fix panic from use after free in qla2x00_async_tm_cmd
scsi: sd: fix entropy gathering for most rotational disks
+11
-5
+2
-2
drivers/scsi/qla2xxx/qla_init.c
+2
-2
drivers/scsi/qla2xxx/qla_init.c
···
1785
1785
1786
1786
/* Issue Marker IOCB */
1787
1787
qla2x00_marker(vha, vha->hw->req_q_map[0],
1788
-
vha->hw->rsp_q_map[0], sp->fcport->loop_id, lun,
1788
+
vha->hw->rsp_q_map[0], fcport->loop_id, lun,
1789
1789
flags == TCF_LUN_RESET ? MK_SYNC_ID_LUN : MK_SYNC_ID);
1790
1790
}
1791
1791
1792
1792
done_free_sp:
1793
1793
sp->free(sp);
1794
-
sp->fcport->flags &= ~FCF_ASYNC_SENT;
1794
+
fcport->flags &= ~FCF_ASYNC_SENT;
1795
1795
done:
1796
1796
return rval;
1797
1797
}
+9
-3
drivers/scsi/sd.c
+9
-3
drivers/scsi/sd.c
···
2951
2951
if (rot == 1) {
2952
2952
blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
2953
2953
blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, q);
2954
-
} else {
2955
-
blk_queue_flag_clear(QUEUE_FLAG_NONROT, q);
2956
-
blk_queue_flag_set(QUEUE_FLAG_ADD_RANDOM, q);
2957
2954
}
2958
2955
2959
2956
if (sdkp->device->type == TYPE_ZBC) {
···
3086
3089
*/
3087
3090
if (sdkp->media_present) {
3088
3091
sd_read_capacity(sdkp, buffer);
3092
+
3093
+
/*
3094
+
* set the default to rotational. All non-rotational devices
3095
+
* support the block characteristics VPD page, which will
3096
+
* cause this to be updated correctly and any device which
3097
+
* doesn't support it should be treated as rotational.
3098
+
*/
3099
+
blk_queue_flag_clear(QUEUE_FLAG_NONROT, q);
3100
+
blk_queue_flag_set(QUEUE_FLAG_ADD_RANDOM, q);
3089
3101
3090
3102
if (scsi_device_supports_vpd(sdp)) {
3091
3103
sd_read_block_provisioning(sdkp);