From patchwork Thu Jan 30 18:39:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 232332 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 385B4C2D0DB for ; Thu, 30 Jan 2020 18:50:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03BAA205F4 for ; Thu, 30 Jan 2020 18:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580410257; bh=O6+CZwV5/GKO30XluKSVwYLUjTq2JGzDCBB2SFqBBys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DLOjrN99RoMDUyYNcvIHLTYfzHwXEh3sWovf1BF6QUSMuQ3OBK0cj89/w0nwstnQN 5HTIjRC4J6BUw+9gxET017IyqlybMtuJQlukfdgMoJXXAxqOy2DLDU92+90FLU8BT5 lmTicRRUmZBG4rCuJetPRd00HPyLw9ndNIQsc0+8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731165AbgA3SqQ (ORCPT ); Thu, 30 Jan 2020 13:46:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:56158 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731158AbgA3SqO (ORCPT ); Thu, 30 Jan 2020 13:46:14 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 24BB42083E; Thu, 30 Jan 2020 18:46:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580409973; bh=O6+CZwV5/GKO30XluKSVwYLUjTq2JGzDCBB2SFqBBys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pO7pRbgBKvw9YdxKvtgLBuOV1yMFrPU5z7Kr7rN4zU3azYmJVxr/bM8gyK3aG8pV6 8NqiWfScaaUSzpZcM46k2PmkzNasqFIhz2LpEahZfMXjQjyI3zZmPSM7KT9LVYbUNn oFDtoyjWCSfHP1KHGIld6SJ2Y+RdnfOhGSsmz0bQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Herbert Xu Subject: [PATCH 5.4 107/110] crypto: pcrypt - Fix user-after-free on module unload Date: Thu, 30 Jan 2020 19:39:23 +0100 Message-Id: <20200130183626.075084354@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200130183613.810054545@linuxfoundation.org> References: <20200130183613.810054545@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Herbert Xu commit 07bfd9bdf568a38d9440c607b72342036011f727 upstream. On module unload of pcrypt we must unregister the crypto algorithms first and then tear down the padata structure. As otherwise the crypto algorithms are still alive and can be used while the padata structure is being freed. Fixes: 5068c7a883d1 ("crypto: pcrypt - Add pcrypt crypto...") Cc: Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- crypto/pcrypt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/crypto/pcrypt.c +++ b/crypto/pcrypt.c @@ -362,11 +362,12 @@ err: static void __exit pcrypt_exit(void) { + crypto_unregister_template(&pcrypt_tmpl); + pcrypt_fini_padata(pencrypt); pcrypt_fini_padata(pdecrypt); kset_unregister(pcrypt_kset); - crypto_unregister_template(&pcrypt_tmpl); } subsys_initcall(pcrypt_init);