diff options
| author | YueHaibing <yuehaibing@huawei.com> | 2019-05-27 10:22:09 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2019-05-29 22:04:09 -0400 |
| commit | 12e750bc62044de096ab9a95201213fd912b9994 (patch) | |
| tree | f96d0a493bd210fcd747f8fa1db34b5922dc615b | |
| parent | 1d94f06e7f5df4064ef336b7b710f50143b64a53 (diff) | |
scsi: scsi_dh_alua: Fix possible null-ptr-deref
If alloc_workqueue fails in alua_init, it should return -ENOMEM, otherwise
it will trigger null-ptr-deref while unloading module which calls
destroy_workqueue dereference
wq->lock like this:
BUG: KASAN: null-ptr-deref in __lock_acquire+0x6b4/0x1ee0
Read of size 8 at addr 0000000000000080 by task syz-executor.0/7045
CPU: 0 PID: 7045 Comm: syz-executor.0 Tainted: G C 5.1.0+ #28
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1
Call Trace:
dump_stack+0xa9/0x10e
__kasan_report+0x171/0x18d
? __lock_acquire+0x6b4/0x1ee0
kasan_report+0xe/0x20
__lock_acquire+0x6b4/0x1ee0
lock_acquire+0xb4/0x1b0
__mutex_lock+0xd8/0xb90
drain_workqueue+0x25/0x290
destroy_workqueue+0x1f/0x3f0
__x64_sys_delete_module+0x244/0x330
do_syscall_64+0x72/0x2a0
entry_SYSCALL_64_after_hwframe+0x49/0xbe
Reported-by: Hulk Robot <hulkci@huawei.com>
Fixes: 03197b61c5ec ("scsi_dh_alua: Use workqueue for RTPG")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
| -rw-r--r-- | drivers/scsi/device_handler/scsi_dh_alua.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c index d7ac498ba35a..2a9dcb8973b7 100644 --- a/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/drivers/scsi/device_handler/scsi_dh_alua.c | |||
| @@ -1174,10 +1174,8 @@ static int __init alua_init(void) | |||
| 1174 | int r; | 1174 | int r; |
| 1175 | 1175 | ||
| 1176 | kaluad_wq = alloc_workqueue("kaluad", WQ_MEM_RECLAIM, 0); | 1176 | kaluad_wq = alloc_workqueue("kaluad", WQ_MEM_RECLAIM, 0); |
| 1177 | if (!kaluad_wq) { | 1177 | if (!kaluad_wq) |
| 1178 | /* Temporary failure, bypass */ | 1178 | return -ENOMEM; |
| 1179 | return SCSI_DH_DEV_TEMP_BUSY; | ||
| 1180 | } | ||
| 1181 | 1179 | ||
| 1182 | r = scsi_register_device_handler(&alua_dh); | 1180 | r = scsi_register_device_handler(&alua_dh); |
| 1183 | if (r != 0) { | 1181 | if (r != 0) { |
