[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>

diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 41635b13ccb12e60ba484642967c8d02431d3260..9a3c138ec50c5514e4c8d9543087918e8524afa6 100644 (file)
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -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;
 
-       if (pool != NULL) {
+       if (pool)
                data = mempool_alloc(pool, GFP_ATOMIC);
-               if (likely(data != NULL)) {
-                       data->ct.pool = pool;
-               }
-       } else {
+       else
                data = kmem_cache_alloc(zfcp_data.gid_pn_cache, GFP_ATOMIC);
-       }
 
         if (NULL == data)
                 return -ENOMEM;
 
        memset(data, 0, sizeof(*data));
+       data->ct.pool = pool;
        sg_init_table(&data->req , 1);
        sg_init_table(&data->resp , 1);
         data->ct.req = &data->req;