diff mbox

[U-Boot] driver: net: fsl-mc: Check NULL before pointer dereference

Message ID 1458297963-19897-1-git-send-email-prabhakar.kushwaha@nxp.com
State Accepted
Delegated to: York Sun
Headers show

Commit Message

Prabhakar Kushwaha March 18, 2016, 10:46 a.m. UTC 
NULL pointer should be checked before any dereference.  This patch
move memest after the NULL pointer check.

Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
Reported-by: Jose Rivera <german.rivera@nxp.com>
---
 drivers/net/fsl-mc/dpio/qbman_sys.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

York Sun March 29, 2016, 3:45 p.m. UTC | #1 
On 03/18/2016 03:46 AM, Prabhakar Kushwaha wrote:
> NULL pointer should be checked before any dereference.  This patch
> move memest after the NULL pointer check.
> 
> Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
> Reported-by: Jose Rivera <german.rivera@nxp.com>
> ---
>  drivers/net/fsl-mc/dpio/qbman_sys.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Applied to u-boot-fsl-qoriq master. Awaiting upstream.

Thanks.

York
diff mbox

Patch

diff --git a/drivers/net/fsl-mc/dpio/qbman_sys.h b/drivers/net/fsl-mc/dpio/qbman_sys.h
index 235d641..7a537fb 100644
--- a/drivers/net/fsl-mc/dpio/qbman_sys.h
+++ b/drivers/net/fsl-mc/dpio/qbman_sys.h
@@ -255,11 +255,11 @@  static inline int qbman_swp_sys_init(struct qbman_swp_sys *s,
 	s->addr_cena = d->cena_bar;
 	s->addr_cinh = d->cinh_bar;
 	s->cena = (void *)valloc(CONFIG_SYS_PAGE_SIZE);
-	memset((void *)s->cena, 0x00, CONFIG_SYS_PAGE_SIZE);
 	if (!s->cena) {
 		printf("Could not allocate page for cena shadow\n");
 		return -1;
 	}
+	memset((void *)s->cena, 0x00, CONFIG_SYS_PAGE_SIZE);
 
 #ifdef QBMAN_CHECKING
 	/* We should never be asked to initialise for a portal that isn't in