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 X-Spam-Level: X-Spam-Status: No, score=-6.0 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,URIBL_BLOCKED,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 B40DAC04E87 for ; Mon, 20 May 2019 12:43:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 80554204FD for ; Mon, 20 May 2019 12:43:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558356229; bh=4CXJx8mG7PBQ+VliU1mAvTpPrbLkRKfqM+3TOBtjgf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=guRxyOXVvgZ0mWR5Lkc72rzLyDAUgAu8Z2SE1s8PptqRPJYbrJgzTko6KlhIrjJ3v BnbLLzf6PebeM7xOq6mBNSVeNYbSDfIPepRmfInoKOrXwzM6dpWGoPRUmDeRG8YxRc VbDxYUTfouoXnk+E/XHo7DlAT/mmTOFfS5AqrURM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389740AbfETM2p (ORCPT ); Mon, 20 May 2019 08:28:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:42198 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389349AbfETM0p (ORCPT ); Mon, 20 May 2019 08:26:45 -0400 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 2677A21479; Mon, 20 May 2019 12:26:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558355204; bh=4CXJx8mG7PBQ+VliU1mAvTpPrbLkRKfqM+3TOBtjgf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jw0JSLV1zJV7GUkzmZ+d8ACZM8qQzwvwVhS6qT6mgv7ngoEMCv6/bQK5OrXjtKvSy du+YQlhmkMKfld2zZq6OJAVGSKxUeXYFTsJkeU5uD124ThlOGEJAuov0vtJGV6YpE+ N8hfe4DUiXv4TODj95txeuk792TunhpAp2PgWyAA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tom Lendacky , Herbert Xu , Gary Hook , Brijesh Singh Subject: [PATCH 5.0 031/123] crypto: ccp - Do not free psp_master when PLATFORM_INIT fails Date: Mon, 20 May 2019 14:13:31 +0200 Message-Id: <20190520115246.833094276@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520115245.439864225@linuxfoundation.org> References: <20190520115245.439864225@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Singh, Brijesh commit f5a2aeb8b254c764772729a6e48d4e0c914bb56a upstream. Currently, we free the psp_master if the PLATFORM_INIT fails during the SEV FW probe. If psp_master is freed then driver does not invoke the PSP FW. As per SEV FW spec, there are several commands (PLATFORM_RESET, PLATFORM_STATUS, GET_ID etc) which can be executed in the UNINIT state We should not free the psp_master when PLATFORM_INIT fails. Fixes: 200664d5237f ("crypto: ccp: Add SEV support") Cc: Tom Lendacky Cc: Herbert Xu Cc: Gary Hook Cc: stable@vger.kernel.org # 4.19.y Signed-off-by: Brijesh Singh Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/ccp/psp-dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/crypto/ccp/psp-dev.c +++ b/drivers/crypto/ccp/psp-dev.c @@ -972,7 +972,7 @@ void psp_pci_init(void) rc = sev_platform_init(&error); if (rc) { dev_err(sp->dev, "SEV: failed to INIT error %#x\n", error); - goto err; + return; } dev_info(sp->dev, "SEV API:%d.%d build:%d\n", psp_master->api_major,