Commit 8e9f1b75 authored by Juergen Gross's avatar Juergen Gross Committed by Greg Kroah-Hartman

SCSI: save command pool address of Scsi_Host

commit f6105c08 upstream.

If a scsi host driver specifies .cmd_len in it's scsi_host_template, a driver's
private command pool is needed. scsi_find_host_cmd_pool() will locate it, but
scsi_alloc_host_cmd_pool() isn't saving the pool address in the host template.

This will result in an access error when the host is removed.

Avoid the problem by saving the address of a new allocated command pool where
it is expected.
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Fixes: 89d9a567Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3b182641
...@@ -380,6 +380,10 @@ scsi_alloc_host_cmd_pool(struct Scsi_Host *shost) ...@@ -380,6 +380,10 @@ scsi_alloc_host_cmd_pool(struct Scsi_Host *shost)
pool->slab_flags |= SLAB_CACHE_DMA; pool->slab_flags |= SLAB_CACHE_DMA;
pool->gfp_mask = __GFP_DMA; pool->gfp_mask = __GFP_DMA;
} }
if (hostt->cmd_size)
hostt->cmd_pool = pool;
return pool; return pool;
} }
...@@ -424,8 +428,10 @@ scsi_get_host_cmd_pool(struct Scsi_Host *shost) ...@@ -424,8 +428,10 @@ scsi_get_host_cmd_pool(struct Scsi_Host *shost)
out_free_slab: out_free_slab:
kmem_cache_destroy(pool->cmd_slab); kmem_cache_destroy(pool->cmd_slab);
out_free_pool: out_free_pool:
if (hostt->cmd_size) if (hostt->cmd_size) {
scsi_free_host_cmd_pool(pool); scsi_free_host_cmd_pool(pool);
hostt->cmd_pool = NULL;
}
goto out; goto out;
} }
...@@ -447,8 +453,10 @@ static void scsi_put_host_cmd_pool(struct Scsi_Host *shost) ...@@ -447,8 +453,10 @@ static void scsi_put_host_cmd_pool(struct Scsi_Host *shost)
if (!--pool->users) { if (!--pool->users) {
kmem_cache_destroy(pool->cmd_slab); kmem_cache_destroy(pool->cmd_slab);
kmem_cache_destroy(pool->sense_slab); kmem_cache_destroy(pool->sense_slab);
if (hostt->cmd_size) if (hostt->cmd_size) {
scsi_free_host_cmd_pool(pool); scsi_free_host_cmd_pool(pool);
hostt->cmd_pool = NULL;
}
} }
mutex_unlock(&host_cmd_pool_mutex); mutex_unlock(&host_cmd_pool_mutex);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment