From patchwork Fri Oct 13 14:53:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 10004949 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1F4ED602B3 for ; Fri, 13 Oct 2017 14:54:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10A422909C for ; Fri, 13 Oct 2017 14:54:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04D9D2909D; Fri, 13 Oct 2017 14:54:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 889C82909E for ; Fri, 13 Oct 2017 14:54:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758064AbdJMOxz (ORCPT ); Fri, 13 Oct 2017 10:53:55 -0400 Received: from mx2.suse.de ([195.135.220.15]:58911 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753231AbdJMOxy (ORCPT ); Fri, 13 Oct 2017 10:53:54 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 6B2A8ABE5; Fri, 13 Oct 2017 14:53:52 +0000 (UTC) Date: Fri, 13 Oct 2017 16:53:44 +0200 From: Borislav Petkov To: Brijesh Singh Cc: Paolo Bonzini , Radim =?utf-8?B?S3LEjW3DocWZ?= , Herbert Xu , Gary Hook , Tom Lendacky , linux-crypto@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [Part2 PATCH v5.1 12.8/31] crypto: ccp: Implement SEV_PEK_CERT_IMPORT ioctl command Message-ID: <20171013145344.wfll3ltikl26zj2y@pd.tnic> References: <20171004131412.13038-13-brijesh.singh@amd.com> <20171007010607.78088-1-brijesh.singh@amd.com> <20171007010607.78088-8-brijesh.singh@amd.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20171007010607.78088-8-brijesh.singh@amd.com> User-Agent: NeoMutt/20170113 (1.7.2) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Fri, Oct 06, 2017 at 08:06:06PM -0500, Brijesh Singh wrote: > The SEV_PEK_CERT_IMPORT command can be used to import the signed PEK > certificate. The command is defined in SEV spec section 5.8. > > Cc: Paolo Bonzini > Cc: "Radim Krčmář" > Cc: Borislav Petkov > Cc: Herbert Xu > Cc: Gary Hook > Cc: Tom Lendacky > Cc: linux-crypto@vger.kernel.org > Cc: kvm@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Brijesh Singh > --- > drivers/crypto/ccp/psp-dev.c | 97 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 97 insertions(+) Just minor cleanups, otherwise looks ok. diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c index 25a437c8d532..e61758af288f 100644 --- a/drivers/crypto/ccp/psp-dev.c +++ b/drivers/crypto/ccp/psp-dev.c @@ -392,7 +392,7 @@ static void *copy_user_blob(u64 __user uaddr, u32 len) if (!data) return ERR_PTR(-ENOMEM); - if (copy_from_user(data, (void __user *)(uintptr_t)uaddr, len)) + if (copy_from_user(data, (void __user *)uaddr, len)) goto e_free; return data; @@ -409,8 +409,7 @@ static int sev_ioctl_pek_cert_import(struct sev_issue_cmd *argp) int ret, state, do_shutdown = 0; void *pek_blob, *oca_blob; - if (copy_from_user(&input, (void __user *)(uintptr_t) argp->data, - sizeof(struct sev_user_data_pek_cert_import))) + if (copy_from_user(&input, (void __user *)argp->data, sizeof(input))) return -EFAULT; data = kzalloc(sizeof(*data), GFP_KERNEL); @@ -456,10 +455,10 @@ static int sev_ioctl_pek_cert_import(struct sev_issue_cmd *argp) do_shutdown = 1; } - ret = sev_handle_cmd(SEV_CMD_PEK_CERT_IMPORT, data, &argp->error); + ret = sev_do_cmd(SEV_CMD_PEK_CERT_IMPORT, data, &argp->error); if (do_shutdown) - sev_handle_cmd(SEV_CMD_SHUTDOWN, 0, NULL); + sev_do_cmd(SEV_CMD_SHUTDOWN, 0, NULL); e_free_oca: kfree(oca_blob); @@ -503,14 +502,14 @@ static long sev_ioctl(struct file *file, unsigned int ioctl, unsigned long arg) ret = sev_ioctl_pdh_gen(&input); break; - case SEV_PEK_CSR: { + case SEV_PEK_CSR: ret = sev_ioctl_pek_csr(&input); break; - } - case SEV_PEK_CERT_IMPORT: { + + case SEV_PEK_CERT_IMPORT: ret = sev_ioctl_pek_cert_import(&input); break; - } + default: ret = -EINVAL; goto out;