From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: berrange@redhat.com, alex.bennee@linaro.org
Subject: [PATCH 4/5] target/i386: SEV: store pointer to decoded id_auth in SevSnpGuest
Date: Thu, 27 Jun 2024 16:53:56 +0200 [thread overview]
Message-ID: <20240627145357.1038664-5-pbonzini@redhat.com> (raw)
In-Reply-To: <20240627145357.1038664-1-pbonzini@redhat.com>
Do not rely on finish->id_auth_uaddr, so that there are no casts from
pointer to uint64_t. They break on 32-bit hosts.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
target/i386/sev.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/target/i386/sev.c b/target/i386/sev.c
index a6b063b762c..28d6bd3adfa 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -155,6 +155,7 @@ struct SevSnpGuestState {
char *id_block_base64;
uint8_t *id_block;
char *id_auth_base64;
+ uint8_t *id_auth;
char *host_data;
struct kvm_sev_snp_launch_start kvm_start_conf;
@@ -2208,16 +2209,16 @@ sev_snp_guest_set_id_auth(Object *obj, const char *value, Error **errp)
struct kvm_sev_snp_launch_finish *finish = &sev_snp_guest->kvm_finish_conf;
gsize len;
+ finish->id_auth_uaddr = 0;
+ g_free(sev_snp_guest->id_auth);
g_free(sev_snp_guest->id_auth_base64);
- g_free((guchar *)finish->id_auth_uaddr);
/* store the base64 str so we don't need to re-encode in getter */
sev_snp_guest->id_auth_base64 = g_strdup(value);
+ sev_snp_guest->id_auth =
+ qbase64_decode(sev_snp_guest->id_auth_base64, -1, &len, errp);
- finish->id_auth_uaddr =
- (uint64_t)qbase64_decode(sev_snp_guest->id_auth_base64, -1, &len, errp);
-
- if (!finish->id_auth_uaddr) {
+ if (!sev_snp_guest->id_auth) {
return;
}
@@ -2226,6 +2227,8 @@ sev_snp_guest_set_id_auth(Object *obj, const char *value, Error **errp)
len, KVM_SEV_SNP_ID_AUTH_SIZE);
return;
}
+
+ finish->id_auth_uaddr = (uintptr_t)sev_snp_guest->id_auth;
}
static bool
--
2.45.2
next prev parent reply other threads:[~2024-06-27 14:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-27 14:53 [PATCH 0/5] target/i386: SEV: fix compiler warnings on 32-bit hosts Paolo Bonzini
2024-06-27 14:53 ` [PATCH 1/5] target/i386: SEV: rename sev_snp_guest->id_block Paolo Bonzini
2024-06-27 16:36 ` Richard Henderson
2024-06-27 14:53 ` [PATCH 2/5] target/i386: SEV: store pointer to decoded id_block in SevSnpGuest Paolo Bonzini
2024-06-27 16:36 ` Richard Henderson
2024-06-27 14:53 ` [PATCH 3/5] target/i386: SEV: rename sev_snp_guest->id_auth Paolo Bonzini
2024-06-27 16:37 ` Richard Henderson
2024-06-27 14:53 ` Paolo Bonzini [this message]
2024-06-27 16:37 ` [PATCH 4/5] target/i386: SEV: store pointer to decoded id_auth in SevSnpGuest Richard Henderson
2024-06-27 14:53 ` [PATCH 5/5] target/i386: SEV: fix format strings for 32-bit hosts Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240627145357.1038664-5-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).