[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <5480DE25.2020802@users.sourceforge.net>
Date: Thu, 04 Dec 2014 23:20:21 +0100
From: SF Markus Elfring <elfring@...rs.sourceforge.net>
To: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>,
Paul Mackerras <paulus@...ba.org>, linux-ppp@...r.kernel.org,
netdev@...r.kernel.org, Eric Dumazet <eric.dumazet@...il.com>
CC: LKML <linux-kernel@...r.kernel.org>,
kernel-janitors@...r.kernel.org,
Julia Lawall <julia.lawall@...6.fr>
Subject: [PATCH v2 6/6] net-PPP: Delete another unnecessary assignment in
mppe_alloc()
From: Markus Elfring <elfring@...rs.sourceforge.net>
Date: Thu, 4 Dec 2014 22:42:30 +0100
The data structure element "sha1" was assigned a null pointer by the
mppe_alloc() after a function call "crypto_alloc_hash" failed.
It was determined that this element was not accessed by the implementation
of the crypto_free_blkcipher() function.
Let us delete it from the affected implementation because the element "sha1"
will not be accessible outside the function after the detected
allocation failure.
Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net>
---
drivers/net/ppp/ppp_mppe.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c
index b7db4b1..32cb054 100644
--- a/drivers/net/ppp/ppp_mppe.c
+++ b/drivers/net/ppp/ppp_mppe.c
@@ -208,10 +208,8 @@ static void *mppe_alloc(unsigned char *options, int optlen)
goto out_free;
state->sha1 = crypto_alloc_hash("sha1", 0, CRYPTO_ALG_ASYNC);
- if (IS_ERR(state->sha1)) {
- state->sha1 = NULL;
+ if (IS_ERR(state->sha1))
goto out_free_blkcipher;
- }
digestsize = crypto_hash_digestsize(state->sha1);
if (digestsize < MPPE_MAX_KEY_LEN)
--
2.1.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists