Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754911AbaLDWSr (ORCPT ); Thu, 4 Dec 2014 17:18:47 -0500 Received: from mout.web.de ([212.227.15.14]:59475 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751663AbaLDWSp (ORCPT ); Thu, 4 Dec 2014 17:18:45 -0500 Message-ID: <5480DDC1.6040101@users.sourceforge.net> Date: Thu, 04 Dec 2014 23:18:41 +0100 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Sergei Shtylyov , Paul Mackerras , linux-ppp@vger.kernel.org, netdev@vger.kernel.org, Eric Dumazet CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH v2 5/6] net-PPP: Delete an unnecessary assignment in mppe_alloc() 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> <547B496E.604@users.sourceforge.net> <547C5CBC.6060607@cogentembedded.com> <547C82A6.2030808@users.sourceforge.net> <547CA157.1080401@cogentembedded.com> <5480DA32.8000201@users.sourceforge.net> In-Reply-To: <5480DA32.8000201@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:osHfzD+Y0rXkdvV6duuASJvZUw2TrkT8jAGgk6cBitqGUN0OyZC w5uZUFdFDWslOBRAzSPIXQa1TpW1I2hfglHrBttjchKGFf5KeLLsHVCHcBskxoniYMESZal 2xrD6Y2w8lOTAuF10/6b7m9CohNKZbXYUJ2d+X/Jo8ffo3gcjbsGuOs+QSXmZeOtgd2d0p5 bKXeOEJoSJB2oL5s6FGTw== 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: Thu, 4 Dec 2014 22:33:34 +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 c82198f..b7db4b1 100644 --- a/drivers/net/ppp/ppp_mppe.c +++ b/drivers/net/ppp/ppp_mppe.c @@ -204,10 +204,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/