* [PATCH 1/1] ppp: remove NULL check before kfree
@ 2015-06-24 9:39 Maninder Singh
0 siblings, 0 replies; 2+ messages in thread
From: Maninder Singh @ 2015-06-24 9:39 UTC (permalink / raw)
To: paulus, linux-ppp, netdev; +Cc: pankaj.m, Maninder Singh
No need of explicit NULL check before kfree,
removing the same and little coding style changes.
Signed-off-by: Maninder Singh <maninder1.s@samsung.com>
Reviewed-by: Vaneet narang <v.narang@samsung.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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] ppp: remove NULL check before kfree
@ 2015-06-24 11:05 Maninder Singh
0 siblings, 0 replies; 2+ messages in thread
From: Maninder Singh @ 2015-06-24 11:05 UTC (permalink / raw)
To: paulus, linux-ppp, netdev; +Cc: PANKAJ MISHRA
>No need of explicit NULL check before kfree,
>removing the same and little coding style changes.
>
>Signed-off-by: Maninder Singh <maninder1.s@samsung.com>
>Reviewed-by: Vaneet narang <v.narang@samsung.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
Send V2 of patch with some more changes.
Thanks
Maninder
-------
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-06-24 11:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-24 9:39 [PATCH 1/1] ppp: remove NULL check before kfree Maninder Singh
2015-06-24 11:05 Maninder Singh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).