commit 030b4b3309e29c6c857d8521c3076743663c259e
author Ali Ayoub <ali@dev.mellanox.co.il> Mon Jan 10 17:42:06 2011 -0800
committer Roland Dreier <rolandd@cisco.com> Mon Jan 10 17:42:06 2011 -0800
tree 07fb6c45846564c6c356f102216f5311c05ccad9
parent 3afa9f19e5bd16abed998b7bf1b178206403286f

mlx4_core: Avoid vunmap() of invalid pointer if allocation fails

Signed-off-by: Ali Ayoub <ali@mellanox.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

drivers/net/mlx4/alloc.c

diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/mlx4/alloc.c
index 8f4bf1f..3a4277f 100644
--- a/drivers/net/mlx4/alloc.c
+++ b/drivers/net/mlx4/alloc.c
@@ -178,6 +178,7 @@
 	} else {
 		int i;
 
+		buf->direct.buf  = NULL;
 		buf->nbufs       = (size + PAGE_SIZE - 1) / PAGE_SIZE;
 		buf->npages      = buf->nbufs;
 		buf->page_shift  = PAGE_SHIFT;
@@ -229,7 +230,7 @@
 		dma_free_coherent(&dev->pdev->dev, size, buf->direct.buf,
 				  buf->direct.map);
 	else {
-		if (BITS_PER_LONG == 64)
+		if (BITS_PER_LONG == 64 && buf->direct.buf)
 			vunmap(buf->direct.buf);
 
 		for (i = 0; i < buf->nbufs; ++i)