From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15BECC74A44 for ; Fri, 10 Mar 2023 14:30:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232532AbjCJOaj (ORCPT ); Fri, 10 Mar 2023 09:30:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232307AbjCJOaR (ORCPT ); Fri, 10 Mar 2023 09:30:17 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 413FE6A49 for ; Fri, 10 Mar 2023 06:29:09 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CCF83616F0 for ; Fri, 10 Mar 2023 14:29:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C01F2C433EF; Fri, 10 Mar 2023 14:29:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678458548; bh=XTvg2v1iJmFUf19wsU5tZNxfrmm1ZL8B5nCO3q+GHBw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2p4JIsFmeauIA+TTlel/p+V0FjgDbFnissAtpR4XI+Xme2Y17c73XHF+JC+nw3/3O JOjdnVEniBRD3sS8JNyAbvkuyLfqNhiWee5GxoiQlDN4REN5unj3PnT41Q/0o0FIvU TnJuVR3vR3Mgcc75dVN5WoCTRCmUU8ozZ2e18nEo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chen Wandun , Herbert Xu , Sasha Levin Subject: [PATCH 5.4 064/357] crypto: essiv - remove redundant null pointer check before kfree Date: Fri, 10 Mar 2023 14:35:53 +0100 Message-Id: <20230310133736.802371985@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310133733.973883071@linuxfoundation.org> References: <20230310133733.973883071@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chen Wandun [ Upstream commit e18036da5c23530994faf7243b592e581f1efed2 ] kfree has taken null pointer check into account. so it is safe to remove the unnecessary check. Signed-off-by: Chen Wandun Signed-off-by: Herbert Xu Stable-dep-of: b5a772adf45a ("crypto: essiv - Handle EBUSY correctly") Signed-off-by: Sasha Levin --- crypto/essiv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/crypto/essiv.c b/crypto/essiv.c index a8befc8fb06ed..3d3f9d7f607ca 100644 --- a/crypto/essiv.c +++ b/crypto/essiv.c @@ -188,8 +188,7 @@ static void essiv_aead_done(struct crypto_async_request *areq, int err) struct aead_request *req = areq->data; struct essiv_aead_request_ctx *rctx = aead_request_ctx(req); - if (rctx->assoc) - kfree(rctx->assoc); + kfree(rctx->assoc); aead_request_complete(req, err); } -- 2.39.2