Commit f6105c08 authored Aug 04, 2014 by Juergen Gross Committed by James Bottomley Aug 15, 2014

[SCSI] save command pool address of Scsi_Host



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: Juergen Gross <jgross@suse.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Fixes: 89d9a567
Cc: stable@vger.kernel.org
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent 045065d8

drivers/scsi/scsi.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -377,6 +377,10 @@ scsi_alloc_host_cmd_pool(struct Scsi_Host *shost)
		pool->slab_flags \|= SLAB_CACHE_DMA;
		pool->gfp_mask = __GFP_DMA;
		}

		if (hostt->cmd_size)
		hostt->cmd_pool = pool;

		return pool;
		}

		@@ -421,8 +425,10 @@ out:
		out_free_slab:
		kmem_cache_destroy(pool->cmd_slab);
		out_free_pool:
		if (hostt->cmd_size)
		if (hostt->cmd_size) {
		scsi_free_host_cmd_pool(pool);
		hostt->cmd_pool = NULL;
		}
		goto out;
		}

		@@ -444,8 +450,10 @@ static void scsi_put_host_cmd_pool(struct Scsi_Host *shost)
		if (!--pool->users) {
		kmem_cache_destroy(pool->cmd_slab);
		kmem_cache_destroy(pool->sense_slab);
		if (hostt->cmd_size)
		if (hostt->cmd_size) {
		scsi_free_host_cmd_pool(pool);
		hostt->cmd_pool = NULL;
		}
		}
		mutex_unlock(&host_cmd_pool_mutex);
		}

Admin message