[RFC][PATCH v2] ppp: remove NULL check before kfree
From: Maninder Singh <hidden>
Date: 2015-06-24 11:19:52
Subsystem:
networking drivers, ppp protocol drivers and compressors, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Removes NULL check before kfree and using tabs in place of space. and removing checkpatch warning: labels should not be indented. Signed-off-by: Maninder Singh <redacted> Reviewed-by: Vaneet narang <redacted> --- drivers/net/ppp/ppp_mppe.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c
index 05005c6..339b50e 100644
--- a/drivers/net/ppp/ppp_mppe.c
+++ b/drivers/net/ppp/ppp_mppe.c@@ -237,15 +237,14 @@ 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) +out_free: + kfree(state->sha1_digest); + if (state->sha1) crypto_free_hash(state->sha1); - if (state->arc4) + if (state->arc4) crypto_free_blkcipher(state->arc4); - kfree(state); - out: + kfree(state); +out: return NULL; }
@@ -256,13 +255,12 @@ 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); - if (state->arc4) - crypto_free_blkcipher(state->arc4); - kfree(state); + if (state->sha1) + crypto_free_hash(state->sha1); + if (state->arc4) + crypto_free_blkcipher(state->arc4); + kfree(state); } }
--
1.7.9.5