* [PATCH 1/4] crypto: ccp: Fix sparse, use plain integer as NULL pointer
2018-01-15 13:32 [PATCH 0/4] KVM: SVM: kbuild test robot warning fixes Brijesh Singh
@ 2018-01-15 13:32 ` Brijesh Singh
2018-01-15 13:32 ` [PATCH 2/4] KVM: SVM: Fix sparse: incorrect type in argument 1 (different base types) Brijesh Singh
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Brijesh Singh @ 2018-01-15 13:32 UTC (permalink / raw)
To: kvm
Cc: Brijesh Singh, Paolo Bonzini, Radim Krčmář,
Borislav Petkov, Herbert Xu, Gary Hook, Tom Lendacky,
linux-crypto, linux-kernel
Fix sparse warning: Using plain integer as NULL pointer. Replaces
assignment of 0 to pointer with NULL assignment.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Gary Hook <gary.hook@amd.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
---
drivers/crypto/ccp/psp-dev.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c
index fcfa5b1eae61..b3afb6cc9d72 100644
--- a/drivers/crypto/ccp/psp-dev.c
+++ b/drivers/crypto/ccp/psp-dev.c
@@ -211,7 +211,7 @@ static int __sev_platform_shutdown_locked(int *error)
{
int ret;
- ret = __sev_do_cmd_locked(SEV_CMD_SHUTDOWN, 0, error);
+ ret = __sev_do_cmd_locked(SEV_CMD_SHUTDOWN, NULL, error);
if (ret)
return ret;
@@ -271,7 +271,7 @@ static int sev_ioctl_do_reset(struct sev_issue_cmd *argp)
return rc;
}
- return __sev_do_cmd_locked(SEV_CMD_FACTORY_RESET, 0, &argp->error);
+ return __sev_do_cmd_locked(SEV_CMD_FACTORY_RESET, NULL, &argp->error);
}
static int sev_ioctl_do_platform_status(struct sev_issue_cmd *argp)
@@ -299,7 +299,7 @@ static int sev_ioctl_do_pek_pdh_gen(int cmd, struct sev_issue_cmd *argp)
return rc;
}
- return __sev_do_cmd_locked(cmd, 0, &argp->error);
+ return __sev_do_cmd_locked(cmd, NULL, &argp->error);
}
static int sev_ioctl_do_pek_csr(struct sev_issue_cmd *argp)
@@ -624,7 +624,7 @@ EXPORT_SYMBOL_GPL(sev_guest_decommission);
int sev_guest_df_flush(int *error)
{
- return sev_do_cmd(SEV_CMD_DF_FLUSH, 0, error);
+ return sev_do_cmd(SEV_CMD_DF_FLUSH, NULL, error);
}
EXPORT_SYMBOL_GPL(sev_guest_df_flush);
--
2.9.5
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 2/4] KVM: SVM: Fix sparse: incorrect type in argument 1 (different base types)
2018-01-15 13:32 [PATCH 0/4] KVM: SVM: kbuild test robot warning fixes Brijesh Singh
2018-01-15 13:32 ` [PATCH 1/4] crypto: ccp: Fix sparse, use plain integer as NULL pointer Brijesh Singh
@ 2018-01-15 13:32 ` Brijesh Singh
2018-01-15 13:32 ` [PATCH 3/4] include: psp-sev: Capitalize invalid length enum Brijesh Singh
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Brijesh Singh @ 2018-01-15 13:32 UTC (permalink / raw)
To: kvm
Cc: Brijesh Singh, Paolo Bonzini, Radim Krčmář,
Borislav Petkov, Tom Lendacky, linux-kernel, Joerg Roedel
Fix sparse: incorrect type in argument 1 (different base types). Typecast
the userspace address argument.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: linux-kernel@vger.kernel.org
Cc: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
---
arch/x86/kvm/svm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 99476c706c16..8ce5bb7b04d1 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -6135,7 +6135,9 @@ static int sev_launch_measure(struct kvm *kvm, struct kvm_sev_cmd *argp)
goto e_free;
}
- if (!access_ok(VERIFY_WRITE, params.uaddr, params.len)) {
+ if (!access_ok(VERIFY_WRITE,
+ (void __user *)(uintptr_t)params.uaddr,
+ params.len)) {
ret = -EFAULT;
goto e_free;
}
--
2.9.5
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 3/4] include: psp-sev: Capitalize invalid length enum
2018-01-15 13:32 [PATCH 0/4] KVM: SVM: kbuild test robot warning fixes Brijesh Singh
2018-01-15 13:32 ` [PATCH 1/4] crypto: ccp: Fix sparse, use plain integer as NULL pointer Brijesh Singh
2018-01-15 13:32 ` [PATCH 2/4] KVM: SVM: Fix sparse: incorrect type in argument 1 (different base types) Brijesh Singh
@ 2018-01-15 13:32 ` Brijesh Singh
2018-01-15 13:32 ` [PATCH 4/4] KVM: SVM: Fix SEV LAUNCH_SECRET command Brijesh Singh
2018-02-24 0:16 ` [PATCH 0/4] KVM: SVM: kbuild test robot warning fixes Paolo Bonzini
4 siblings, 0 replies; 6+ messages in thread
From: Brijesh Singh @ 2018-01-15 13:32 UTC (permalink / raw)
To: kvm
Cc: Brijesh Singh, Paolo Bonzini, Radim Krčmář,
Borislav Petkov, Tom Lendacky, Gary R Hook, linux-kernel
Commit 1d57b17c60ff ("crypto: ccp: Define SEV userspace ioctl and command
id") added the invalid length enum but we missed capitalizing it.
Fixes: 1d57b17c60ff (crypto: ccp: Define SEV userspace ioctl ...)
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
CC: Gary R Hook <gary.hook@amd.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
---
include/uapi/linux/psp-sev.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/linux/psp-sev.h b/include/uapi/linux/psp-sev.h
index 3d77fe91239a..9008f31c7eb6 100644
--- a/include/uapi/linux/psp-sev.h
+++ b/include/uapi/linux/psp-sev.h
@@ -42,7 +42,7 @@ typedef enum {
SEV_RET_INVALID_PLATFORM_STATE,
SEV_RET_INVALID_GUEST_STATE,
SEV_RET_INAVLID_CONFIG,
- SEV_RET_INVALID_len,
+ SEV_RET_INVALID_LEN,
SEV_RET_ALREADY_OWNED,
SEV_RET_INVALID_CERTIFICATE,
SEV_RET_POLICY_FAILURE,
--
2.9.5
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 4/4] KVM: SVM: Fix SEV LAUNCH_SECRET command
2018-01-15 13:32 [PATCH 0/4] KVM: SVM: kbuild test robot warning fixes Brijesh Singh
` (2 preceding siblings ...)
2018-01-15 13:32 ` [PATCH 3/4] include: psp-sev: Capitalize invalid length enum Brijesh Singh
@ 2018-01-15 13:32 ` Brijesh Singh
2018-02-24 0:16 ` [PATCH 0/4] KVM: SVM: kbuild test robot warning fixes Paolo Bonzini
4 siblings, 0 replies; 6+ messages in thread
From: Brijesh Singh @ 2018-01-15 13:32 UTC (permalink / raw)
To: kvm
Cc: Brijesh Singh, Paolo Bonzini, Radim Krčmář,
Borislav Petkov, Tom Lendacky, linux-kernel, Joerg Roedel
The SEV LAUNCH_SECRET command fails with error code 'invalid param'
because we missed filling the guest and header system physical address
while issuing the command.
Fixes: 9f5b5b950aa9 (KVM: SVM: Add support for SEV LAUNCH_SECRET command)
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: linux-kernel@vger.kernel.org
Cc: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
---
arch/x86/kvm/svm.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 8ce5bb7b04d1..ef33bef85691 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -6472,7 +6472,7 @@ static int sev_launch_secret(struct kvm *kvm, struct kvm_sev_cmd *argp)
struct page **pages;
void *blob, *hdr;
unsigned long n;
- int ret;
+ int ret, offset;
if (!sev_guest(kvm))
return -ENOTTY;
@@ -6498,6 +6498,10 @@ static int sev_launch_secret(struct kvm *kvm, struct kvm_sev_cmd *argp)
if (!data)
goto e_unpin_memory;
+ offset = params.guest_uaddr & (PAGE_SIZE - 1);
+ data->guest_address = __sme_page_pa(pages[0]) + offset;
+ data->guest_len = params.guest_len;
+
blob = psp_copy_user_blob(params.trans_uaddr, params.trans_len);
if (IS_ERR(blob)) {
ret = PTR_ERR(blob);
@@ -6512,8 +6516,8 @@ static int sev_launch_secret(struct kvm *kvm, struct kvm_sev_cmd *argp)
ret = PTR_ERR(hdr);
goto e_free_blob;
}
- data->trans_address = __psp_pa(blob);
- data->trans_len = params.trans_len;
+ data->hdr_address = __psp_pa(hdr);
+ data->hdr_len = params.hdr_len;
data->handle = sev->handle;
ret = sev_issue_cmd(kvm, SEV_CMD_LAUNCH_UPDATE_SECRET, data, &argp->error);
--
2.9.5
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 0/4] KVM: SVM: kbuild test robot warning fixes
2018-01-15 13:32 [PATCH 0/4] KVM: SVM: kbuild test robot warning fixes Brijesh Singh
` (3 preceding siblings ...)
2018-01-15 13:32 ` [PATCH 4/4] KVM: SVM: Fix SEV LAUNCH_SECRET command Brijesh Singh
@ 2018-02-24 0:16 ` Paolo Bonzini
4 siblings, 0 replies; 6+ messages in thread
From: Paolo Bonzini @ 2018-02-24 0:16 UTC (permalink / raw)
To: Brijesh Singh, kvm
Cc: Radim Krčmář,
Borislav Petkov, Herbert Xu, Gary Hook, Tom Lendacky,
Joerg Roedel, linux-crypto, linux-kernel
On 15/01/2018 14:32, Brijesh Singh wrote:
> The patch series fixes the warnings reported by kbuild test robot
> after SEV patches. Additionally, during testing I found that LAUNCH_SECRET
> command was broken and patch series contains the fix for it.
>
> The patch series applies on kvm/queue branch.
>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: "Radim Krčmář" <rkrcmar@redhat.com>
> Cc: Borislav Petkov <bp@suse.de>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: Gary Hook <gary.hook@amd.com>
> Cc: Tom Lendacky <thomas.lendacky@amd.com>
> Cc: Joerg Roedel <joro@8bytes.org>
> Cc: linux-crypto@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
>
> Brijesh Singh (4):
> crypto: ccp: Fix sparse, use plain integer as NULL pointer
> KVM: SVM: Fix sparse: incorrect type in argument 1 (different base
> types)
> include: psp-sev: Capitalize invalid length enum
> KVM: SVM: Fix SEV LAUNCH_SECRET command
>
> arch/x86/kvm/svm.c | 14 ++++++++++----
> drivers/crypto/ccp/psp-dev.c | 8 ++++----
> include/uapi/linux/psp-sev.h | 2 +-
> 3 files changed, 15 insertions(+), 9 deletions(-)
>
Applying patches 1 and 3 from this series, thanks.
Paolo
^ permalink raw reply [flat|nested] 6+ messages in thread