From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933611AbbFWVUl (ORCPT ); Tue, 23 Jun 2015 17:20:41 -0400 Received: from mout.web.de ([212.227.17.12]:60360 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932396AbbFWVUe (ORCPT ); Tue, 23 Jun 2015 17:20:34 -0400 Message-ID: <5589CD95.9080508@users.sourceforge.net> Date: Tue, 23 Jun 2015 23:20:21 +0200 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: "David S. Miller" , Herbert Xu , linux-crypto@vger.kernel.org CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH] crypto-jitterentropy: Delete unnecessary checks before the function call "kzfree" 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> In-Reply-To: <5317A59D.4@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:xFjTRzDyHx3jQa6V+4uNcBXANQNntOBDzr/3+jTMj0e9vfML/V6 YQfSFhAKvnSOgcceZlqmNNJUngmpn7EZlGs8LRmwsGnFLR23NV92xC2Jp2EZFH3EZWS1bt2 YiA/bdJfTwrhbiQflVmVkDHJJ/vNj2zvox5HgojItEXRwNdf/0DCzZ0FEQxi0t35GC8GU0h nTC89Qlh084McW5ks06Fg== X-UI-Out-Filterresults: notjunk:1;V01:K0:HPEFWQEgRJs=:GKIE7zpp8RZD9SC1KY8Yrd ibaq8g5/KGH+xZf5sB2+GXIosDr0d0IdDITg0tCQOJlVtUiAg0hwcH+SSZYbnGvDV+YRHxnYA LJ9fclpetICth2Y421AxE6phRZz/3tRZbS4go/ctsoX+F2BjZqP8iTjIHP1FqT8wdjFaBdek4 8Z1AibxrQzrnMkB2k8L9Ot57R8btOlTnIaFnwjyApM2wjZjEXLPWlZzvMfDvLscC2R4b/Tazd ZhwbgR8qxcHTN/xmmfoIgFQKy7vMLkg9Nd4y/IFYAG/cgDkdydCKtkQgnBwhs9fx2jI0heVfG DufSOR6QyNP44OmsTsVDBmw+lZKUUuCxcn94Rptl1jCn6iy2HfJ6jMnWIfvF8BGZWEkuR0NPq XrNT1oiU/YvcG87z5lw7WlBNyZ6PNlQba2XmR/9V/1PEcVClkmHiw20rPsYaXt3S6sdGglCz5 EzhAXII4EgYRlJTRD4ChW97WKf6RtjB88h3+vmC7gGQ9MpYOoqQx4T0iR457eSNvmbpoA0Quu DuO3v96G0fw4T93S/26Ulm0a++kdC01NSQ5AZ9LWVGBFKE+AziccZaho67+vnvJEhCU9w31tA 9TT7+LvejAeQWd6Rc0wEKMdbUe6LGpprT0hx6nvf6R4lP/AT4PbRogyIJWR4YwbxEADLgDcQo b2S2Ph69ICzm1Z2vQ40vCiBOBS7PXhnvSefq7IM02fvI24p+DbJb9tqP4WllWXP6odm0= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 23 Jun 2015 22:30:21 +0200 The kzfree() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- crypto/jitterentropy.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/crypto/jitterentropy.c b/crypto/jitterentropy.c index d3c3045..22ded3e 100644 --- a/crypto/jitterentropy.c +++ b/crypto/jitterentropy.c @@ -698,11 +698,9 @@ static struct rand_data *jent_entropy_collector_alloc(unsigned int osr, static void jent_entropy_collector_free(struct rand_data *entropy_collector) { - if (entropy_collector->mem) - kzfree(entropy_collector->mem); + kzfree(entropy_collector->mem); entropy_collector->mem = NULL; - if (entropy_collector) - kzfree(entropy_collector); + kzfree(entropy_collector); entropy_collector = NULL; } -- 2.4.4