netdev - [PATCH 1/1] ppp: remove NULL check before kfree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Wed, 24 Jun 2015 15:09:42 +0530
From:	Maninder Singh <maninder1.s@...sung.com>
To:	paulus@...ba.org, linux-ppp@...r.kernel.org, netdev@...r.kernel.org
Cc:	pankaj.m@...sung.com, Maninder Singh <maninder1.s@...sung.com>
Subject: [PATCH 1/1] ppp: remove NULL check before kfree

No need of explicit NULL check before kfree,
removing the same and little coding style changes.

Signed-off-by: Maninder Singh <maninder1.s@...sung.com>
Reviewed-by: Vaneet narang <v.narang@...sung.com>
---
 drivers/net/ppp/ppp_mppe.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c
index 05005c6..06f60b1 100644
--- a/drivers/net/ppp/ppp_mppe.c
+++ b/drivers/net/ppp/ppp_mppe.c
@@ -238,12 +238,11 @@ static void *mppe_alloc(unsigned char *options, int optlen)
 	return (void *)state;
 
 	out_free:
-	    if (state->sha1_digest)
 		kfree(state->sha1_digest);
 	    if (state->sha1)
-		crypto_free_hash(state->sha1);
+			crypto_free_hash(state->sha1);
 	    if (state->arc4)
-		crypto_free_blkcipher(state->arc4);
+			crypto_free_blkcipher(state->arc4);
 	    kfree(state);
 	out:
 	return NULL;
@@ -256,12 +255,11 @@ static void mppe_free(void *arg)
 {
 	struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg;
 	if (state) {
-	    if (state->sha1_digest)
 		kfree(state->sha1_digest);
 	    if (state->sha1)
-		crypto_free_hash(state->sha1);
+			crypto_free_hash(state->sha1);
 	    if (state->arc4)
-		crypto_free_blkcipher(state->arc4);
+			crypto_free_blkcipher(state->arc4);
 	    kfree(state);
 	}
 }
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html