Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752566AbaK3QsB (ORCPT ); Sun, 30 Nov 2014 11:48:01 -0500 Received: from mout.web.de ([212.227.15.4]:60416 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752111AbaK3QsA (ORCPT ); Sun, 30 Nov 2014 11:48:00 -0500 Message-ID: <547B4A35.7000500@users.sourceforge.net> Date: Sun, 30 Nov 2014 17:47:49 +0100 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Paul Mackerras , linux-ppp@vger.kernel.org, netdev@vger.kernel.org CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH 3/3] net-PPP: Delete an unnecessary assignment References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <547B4886.4080406@users.sourceforge.net> In-Reply-To: <547B4886.4080406@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:miZioYw1GXqTMsQqywf/7f58jLloHTFJ9DrJP+zgSN+ExgHDBzM 5vQ6y40msroHqeBaX91KBrXzIpsgGbgGQ/xx7NWDnGIbl0V+5FJga7xqdZ24Lar2cOhq7Af cBYjDudLEvHmmr6zrNvLozJ2Z09TiIIJPzTAty+QH5UhQS06u2T8TTrP3L58a8hmm6jeJ2W 3iYYPKA5ZqdxIMguId2lA== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 30 Nov 2014 17:17:36 +0100 The data structure element "arc4" was assigned a null pointer by the mppe_alloc() function if a previous function call "crypto_alloc_blkcipher" failed. This assignment became unnecessary with previous source code adjustments. Let us delete it from the affected implementation because the element "arc4" will not be accessible outside the function after the detected allocation failure. Signed-off-by: Markus Elfring --- 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 962c1a0..d913bc9 100644 --- a/drivers/net/ppp/ppp_mppe.c +++ b/drivers/net/ppp/ppp_mppe.c @@ -205,10 +205,8 @@ static void *mppe_alloc(unsigned char *options, int optlen) state->arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC); - if (IS_ERR(state->arc4)) { - state->arc4 = NULL; + if (IS_ERR(state->arc4)) goto out_free; - } state->sha1 = crypto_alloc_hash("sha1", 0, CRYPTO_ALG_ASYNC); if (IS_ERR(state->sha1)) { -- 2.1.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/