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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A27A4C433F5 for ; Tue, 5 Oct 2021 19:52:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 839CC611F0 for ; Tue, 5 Oct 2021 19:52:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235351AbhJETyI (ORCPT ); Tue, 5 Oct 2021 15:54:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234130AbhJETyH (ORCPT ); Tue, 5 Oct 2021 15:54:07 -0400 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28CB2C061749 for ; Tue, 5 Oct 2021 12:52:17 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id i3-20020aa79083000000b003efb4fd360dso268250pfa.8 for ; Tue, 05 Oct 2021 12:52:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=GYjYv2lfViakCsNns4R+hOdMsK5mYgMHQz2UmonsX7M=; b=PKz1dvFaJD2xCDaBdwJfFiZi8oyGPOIKssYrKOpxNITyFzraZ1WYs2xvsYUFTw1e8r Xy1bsAW0ffhZtlmysuIIT9PxZw5lkr7g52epTgKZrddJfsGYP+XW9OiVlIetOqKpQXTr 7uiS+2XzBQwWEN0NSOf6vjNiYYLY0jPKC+26y3c/cRFXf8uCnoGDS1A6Z+KkaRStw9T/ lk9xM7WIAzM2C0VTEgx4ifnEbad3fHd5XD/enn9BhwTzJ4eLieC1R2WE1zjL1UJuuHV6 /cvJ9igeUz8SAMQlvYFEplGPxhY+jmm/1KoQ5kFUJzvzH0w5k/doo9wFfKwczL+/M5AA 0knQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=GYjYv2lfViakCsNns4R+hOdMsK5mYgMHQz2UmonsX7M=; b=o+TqUCMdh48HQJwmBZWOCop6XB4sZj79yzDAUP1LWmeNzosxcJkzzUzg/pFMo+nibE 6OWogSQETUYhxaBeM8t4mEHuhZE42PM+Xg9zn0wHXSAuiKzlomAlNnCBphObjXuG8kZp YbxVLNKAyYknz3W/DpOkXgl0OEmkj7thyRMZ+EbxXSE75hQiplZ02H/BFr+6OseUk/9E eZ+UiSQpqdgRX1j5oR+z0YCUVVqGo8bDzpSVoqcxbDRYSlNQxkJ9HcUYS+edjWZA2hx+ R6Wjo797s6W7xhHhClO+hEYfm20MdeJIGmQ+32gkol86vhII6oPguAuKyFiawdYVSBz7 Igsg== X-Gm-Message-State: AOAM5312tEXUwvxpFGalw0WedU9smxbCO6FGoo+dIsfCtRfX1yBeDRLg /LTPxL8wemlKO5c5iZrCoqr0ppxR3o8= X-Google-Smtp-Source: ABdhPJyrR9Hxve8OLbSqYgFTqbgqERpjWe3edUJF1XZdKQtwmUzRab2fiP4NQrKcojdkvyjTo3aEAGlNVwE= X-Received: from pgonda1.kir.corp.google.com ([2620:15c:29:204:b603:db5:e90f:74aa]) (user=pgonda job=sendgmr) by 2002:a17:902:6f01:b0:138:9aca:efda with SMTP id w1-20020a1709026f0100b001389acaefdamr7064594plk.19.1633463536550; Tue, 05 Oct 2021 12:52:16 -0700 (PDT) Date: Tue, 5 Oct 2021 12:52:13 -0700 Message-Id: <20211005195213.2905030-1-pgonda@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.33.0.800.g4c38ced690-goog Subject: [PATCH] crypto: ccp - Consolidate sev INIT logic From: Peter Gonda To: thomas.lendacky@amd.com Cc: Peter Gonda , Brijesh Singh , Marc Orr , Joerg Roedel , Herbert Xu , David Rientjes , John Allen , "David S. Miller" , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Adds new helper function sev_init_if_required() for use in sev_ioctl(). The function calls __sev_platform_init_locked() if the command requires the PSP's internal state be at least SEV_STATE_INIT. This consolidates many checks scattered through out the ioctl delegation functions. Signed-off-by: Peter Gonda Cc: Tom Lendacky Cc: Brijesh Singh Cc: Marc Orr Cc: Joerg Roedel Cc: Herbert Xu Cc: David Rientjes Cc: John Allen Cc: "David S. Miller" Cc: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/crypto/ccp/sev-dev.c | 63 +++++++++++++++--------------------- 1 file changed, 26 insertions(+), 37 deletions(-) diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c index e09925d86bf3..071d57fec4c4 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -386,24 +386,14 @@ static int sev_ioctl_do_platform_status(struct sev_issue_cmd *argp) static int sev_ioctl_do_pek_pdh_gen(int cmd, struct sev_issue_cmd *argp, bool writable) { - struct sev_device *sev = psp_master->sev_data; - int rc; - if (!writable) return -EPERM; - if (sev->state == SEV_STATE_UNINIT) { - rc = __sev_platform_init_locked(&argp->error); - if (rc) - return rc; - } - return __sev_do_cmd_locked(cmd, NULL, &argp->error); } static int sev_ioctl_do_pek_csr(struct sev_issue_cmd *argp, bool writable) { - struct sev_device *sev = psp_master->sev_data; struct sev_user_data_pek_csr input; struct sev_data_pek_csr data; void __user *input_address; @@ -435,12 +425,6 @@ static int sev_ioctl_do_pek_csr(struct sev_issue_cmd *argp, bool writable) data.len = input.length; cmd: - if (sev->state == SEV_STATE_UNINIT) { - ret = __sev_platform_init_locked(&argp->error); - if (ret) - goto e_free_blob; - } - ret = __sev_do_cmd_locked(SEV_CMD_PEK_CSR, &data, &argp->error); /* If we query the CSR length, FW responded with expected data. */ @@ -586,7 +570,6 @@ static int sev_update_firmware(struct device *dev) static int sev_ioctl_do_pek_import(struct sev_issue_cmd *argp, bool writable) { - struct sev_device *sev = psp_master->sev_data; struct sev_user_data_pek_cert_import input; struct sev_data_pek_cert_import data; void *pek_blob, *oca_blob; @@ -617,17 +600,10 @@ static int sev_ioctl_do_pek_import(struct sev_issue_cmd *argp, bool writable) data.oca_cert_address = __psp_pa(oca_blob); data.oca_cert_len = input.oca_cert_len; - /* If platform is not in INIT state then transition it to INIT */ - if (sev->state != SEV_STATE_INIT) { - ret = __sev_platform_init_locked(&argp->error); - if (ret) - goto e_free_oca; - } - ret = __sev_do_cmd_locked(SEV_CMD_PEK_CERT_IMPORT, &data, &argp->error); -e_free_oca: kfree(oca_blob); + e_free_pek: kfree(pek_blob); return ret; @@ -730,7 +706,6 @@ static int sev_ioctl_do_get_id(struct sev_issue_cmd *argp) static int sev_ioctl_do_pdh_export(struct sev_issue_cmd *argp, bool writable) { - struct sev_device *sev = psp_master->sev_data; struct sev_user_data_pdh_cert_export input; void *pdh_blob = NULL, *cert_blob = NULL; struct sev_data_pdh_cert_export data; @@ -738,16 +713,6 @@ static int sev_ioctl_do_pdh_export(struct sev_issue_cmd *argp, bool writable) void __user *input_pdh_cert_address; int ret; - /* If platform is not in INIT state then transition it to INIT. */ - if (sev->state != SEV_STATE_INIT) { - if (!writable) - return -EPERM; - - ret = __sev_platform_init_locked(&argp->error); - if (ret) - return ret; - } - if (copy_from_user(&input, (void __user *)argp->data, sizeof(input))) return -EFAULT; @@ -819,6 +784,26 @@ static int sev_ioctl_do_pdh_export(struct sev_issue_cmd *argp, bool writable) return ret; } +static int sev_init_if_required(int cmd_id, bool writable, + struct sev_issue_cmd *argp) +{ + struct sev_device *sev = psp_master->sev_data; + + lockdep_assert_held(&sev_cmd_mutex); + + if (!writable) + return -EPERM; + + if (cmd_id == SEV_FACTORY_RESET || cmd_id == SEV_PLATFORM_STATUS || + cmd_id == SEV_GET_ID || cmd_id == SEV_GET_ID2) + return 0; + + if (sev->state == SEV_STATE_UNINIT) + return __sev_platform_init_locked(&argp->error); + + return 0; +} + static long sev_ioctl(struct file *file, unsigned int ioctl, unsigned long arg) { void __user *argp = (void __user *)arg; @@ -840,8 +825,11 @@ static long sev_ioctl(struct file *file, unsigned int ioctl, unsigned long arg) mutex_lock(&sev_cmd_mutex); - switch (input.cmd) { + ret = sev_init_if_required(input.cmd, writable, &input); + if (ret) + goto copy_out; + switch (input.cmd) { case SEV_FACTORY_RESET: ret = sev_ioctl_do_reset(&input, writable); break; @@ -875,6 +863,7 @@ static long sev_ioctl(struct file *file, unsigned int ioctl, unsigned long arg) goto out; } +copy_out: if (copy_to_user(argp, &input, sizeof(struct sev_issue_cmd))) ret = -EFAULT; out: -- 2.33.0.800.g4c38ced690-goog