Home » Mailing list archives » linux-netdev » 2010 » June » 10

[patch] enic: cleanup vic_provinfo_alloc()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Dan Carpenter
Subject: [patch] enic: cleanup vic_provinfo_alloc()
Date: Thursday, June 10, 2010 - 12:59 am

If oui were a null variable then vic_provinfo_alloc() would leak memory.
But this function is only called from one place and oui is not null so 
I removed the check.

I also moved the memory allocation down a line so it was easier to spot.
(No one ever reads variable declarations).

Signed-off-by: Dan Carpenter <error27@gmail.com>

diff --git a/drivers/net/enic/vnic_vic.c b/drivers/net/enic/vnic_vic.c
index d769772..0a35085 100644
--- a/drivers/net/enic/vnic_vic.c
+++ b/drivers/net/enic/vnic_vic.c
@@ -25,9 +25,10 @@
 
 struct vic_provinfo *vic_provinfo_alloc(gfp_t flags, u8 *oui, u8 type)
 {
-	struct vic_provinfo *vp = kzalloc(VIC_PROVINFO_MAX_DATA, flags);
+	struct vic_provinfo *vp;
 
-	if (!vp || !oui)
+	vp = kzalloc(VIC_PROVINFO_MAX_DATA, flags);
+	if (!vp)
 		return NULL;
 
 	memcpy(vp->oui, oui, sizeof(vp->oui));
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[patch] enic: cleanup vic_provinfo_alloc(), Dan Carpenter, (Thu Jun 10, 12:59 am)
Re: [patch] enic: cleanup vic_provinfo_alloc(), walter harms, (Thu Jun 10, 2:22 am)
Re: [patch] enic: cleanup vic_provinfo_alloc(), Dan Carpenter, (Thu Jun 10, 2:32 am)
Re: [patch] enic: cleanup vic_provinfo_alloc(), David Miller, (Fri Jun 11, 6:37 pm)