[SCSI] zfcp: Fix mempool pointer for GID_PN request allocation
When allocating memory for GID_PN nameserver requests, the allocation function stores the pointer to the mempool, but then overwrites the pointer via memset. Later, the wrong function to free the memory will be called, since this is based on the stored pointer. Fix this by first initializing the struct and then storing the pointer. Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com> Signed-off-by: Martin Peschke <mp3@de.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
parent
d26ab06ede
commit
9dfe1cc36b
|
@ -1533,19 +1533,16 @@ zfcp_gid_pn_buffers_alloc(struct zfcp_gid_pn_data **gid_pn, mempool_t *pool)
|
||||||
{
|
{
|
||||||
struct zfcp_gid_pn_data *data;
|
struct zfcp_gid_pn_data *data;
|
||||||
|
|
||||||
if (pool != NULL) {
|
if (pool)
|
||||||
data = mempool_alloc(pool, GFP_ATOMIC);
|
data = mempool_alloc(pool, GFP_ATOMIC);
|
||||||
if (likely(data != NULL)) {
|
else
|
||||||
data->ct.pool = pool;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
data = kmem_cache_alloc(zfcp_data.gid_pn_cache, GFP_ATOMIC);
|
data = kmem_cache_alloc(zfcp_data.gid_pn_cache, GFP_ATOMIC);
|
||||||
}
|
|
||||||
|
|
||||||
if (NULL == data)
|
if (NULL == data)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
memset(data, 0, sizeof(*data));
|
memset(data, 0, sizeof(*data));
|
||||||
|
data->ct.pool = pool;
|
||||||
sg_init_table(&data->req , 1);
|
sg_init_table(&data->req , 1);
|
||||||
sg_init_table(&data->resp , 1);
|
sg_init_table(&data->resp , 1);
|
||||||
data->ct.req = &data->req;
|
data->ct.req = &data->req;
|
||||||
|
|
Loading…
Reference in New Issue