KVM: SEV: use u64_to_user_ptr throughout

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index 022d92fb4b85741c7e148d7a35c04bbcbb276550..1642d7d49bde2f3808b644b154c4c39186f0e704 100644 (file)
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -377,7 +377,7 @@ static int sev_launch_start(struct kvm *kvm, struct kvm_sev_cmd *argp)
        if (!sev_guest(kvm))
                return -ENOTTY;
 
-       if (copy_from_user(&params, (void __user *)(uintptr_t)argp->data, sizeof(params)))
+       if (copy_from_user(&params, u64_to_user_ptr(argp->data), sizeof(params)))
                return -EFAULT;
 
        memset(&start, 0, sizeof(start));
@@ -421,7 +421,7 @@ static int sev_launch_start(struct kvm *kvm, struct kvm_sev_cmd *argp)
 
        /* return handle to userspace */
        params.handle = start.handle;
-       if (copy_to_user((void __user *)(uintptr_t)argp->data, &params, sizeof(params))) {
+       if (copy_to_user(u64_to_user_ptr(argp->data), &params, sizeof(params))) {
                sev_unbind_asid(kvm, start.handle);
                ret = -EFAULT;
                goto e_free_session;
@@ -560,7 +560,7 @@ static int sev_launch_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp)
        if (!sev_guest(kvm))
                return -ENOTTY;
 
-       if (copy_from_user(&params, (void __user *)(uintptr_t)argp->data, sizeof(params)))
+       if (copy_from_user(&params, u64_to_user_ptr(argp->data), sizeof(params)))
                return -EFAULT;
 
        vaddr = params.uaddr;
@@ -780,7 +780,7 @@ static int sev_launch_update_vmsa(struct kvm *kvm, struct kvm_sev_cmd *argp)
 
 static int sev_launch_measure(struct kvm *kvm, struct kvm_sev_cmd *argp)
 {
-       void __user *measure = (void __user *)(uintptr_t)argp->data;
+       void __user *measure = u64_to_user_ptr(argp->data);
        struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
        struct sev_data_launch_measure data;
        struct kvm_sev_launch_measure params;
@@ -800,7 +800,7 @@ static int sev_launch_measure(struct kvm *kvm, struct kvm_sev_cmd *argp)
        if (!params.len)
                goto cmd;
 
-       p = (void __user *)(uintptr_t)params.uaddr;
+       p = u64_to_user_ptr(params.uaddr);
        if (p) {
                if (params.len > SEV_FW_BLOB_MAX_SIZE)
                        return -EINVAL;
@@ -873,7 +873,7 @@ static int sev_guest_status(struct kvm *kvm, struct kvm_sev_cmd *argp)
        params.state = data.state;
        params.handle = data.handle;
 
-       if (copy_to_user((void __user *)(uintptr_t)argp->data, &params, sizeof(params)))
+       if (copy_to_user(u64_to_user_ptr(argp->data), &params, sizeof(params)))
                ret = -EFAULT;
 
        return ret;
@@ -1038,7 +1038,7 @@ static int sev_dbg_crypt(struct kvm *kvm, struct kvm_sev_cmd *argp, bool dec)
        if (!sev_guest(kvm))
                return -ENOTTY;
 
-       if (copy_from_user(&debug, (void __user *)(uintptr_t)argp->data, sizeof(debug)))
+       if (copy_from_user(&debug, u64_to_user_ptr(argp->data), sizeof(debug)))
                return -EFAULT;
 
        if (!debug.len || debug.src_uaddr + debug.len < debug.src_uaddr)
@@ -1122,7 +1122,7 @@ static int sev_launch_secret(struct kvm *kvm, struct kvm_sev_cmd *argp)
        if (!sev_guest(kvm))
                return -ENOTTY;
 
-       if (copy_from_user(&params, (void __user *)(uintptr_t)argp->data, sizeof(params)))
+       if (copy_from_user(&params, u64_to_user_ptr(argp->data), sizeof(params)))
                return -EFAULT;
 
        pages = sev_pin_memory(kvm, params.guest_uaddr, params.guest_len, &n, 1);
@@ -1186,7 +1186,7 @@ e_unpin_memory:
 
 static int sev_get_attestation_report(struct kvm *kvm, struct kvm_sev_cmd *argp)
 {
-       void __user *report = (void __user *)(uintptr_t)argp->data;
+       void __user *report = u64_to_user_ptr(argp->data);
        struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
        struct sev_data_attestation_report data;
        struct kvm_sev_attestation_report params;
@@ -1197,7 +1197,7 @@ static int sev_get_attestation_report(struct kvm *kvm, struct kvm_sev_cmd *argp)
        if (!sev_guest(kvm))
                return -ENOTTY;
 
-       if (copy_from_user(&params, (void __user *)(uintptr_t)argp->data, sizeof(params)))
+       if (copy_from_user(&params, u64_to_user_ptr(argp->data), sizeof(params)))
                return -EFAULT;
 
        memset(&data, 0, sizeof(data));
@@ -1206,7 +1206,7 @@ static int sev_get_attestation_report(struct kvm *kvm, struct kvm_sev_cmd *argp)
        if (!params.len)
                goto cmd;
 
-       p = (void __user *)(uintptr_t)params.uaddr;
+       p = u64_to_user_ptr(params.uaddr);
        if (p) {
                if (params.len > SEV_FW_BLOB_MAX_SIZE)
                        return -EINVAL;
@@ -1259,7 +1259,7 @@ __sev_send_start_query_session_length(struct kvm *kvm, struct kvm_sev_cmd *argp,
        ret = sev_issue_cmd(kvm, SEV_CMD_SEND_START, &data, &argp->error);
 
        params->session_len = data.session_len;
-       if (copy_to_user((void __user *)(uintptr_t)argp->data, params,
+       if (copy_to_user(u64_to_user_ptr(argp->data), params,
                                sizeof(struct kvm_sev_send_start)))
                ret = -EFAULT;
 
@@ -1278,7 +1278,7 @@ static int sev_send_start(struct kvm *kvm, struct kvm_sev_cmd *argp)
        if (!sev_guest(kvm))
                return -ENOTTY;
 
-       if (copy_from_user(&params, (void __user *)(uintptr_t)argp->data,
+       if (copy_from_user(&params, u64_to_user_ptr(argp->data),
                                sizeof(struct kvm_sev_send_start)))
                return -EFAULT;
 
@@ -1333,7 +1333,7 @@ static int sev_send_start(struct kvm *kvm, struct kvm_sev_cmd *argp)
 
        ret = sev_issue_cmd(kvm, SEV_CMD_SEND_START, &data, &argp->error);
 
-       if (!ret && copy_to_user((void __user *)(uintptr_t)params.session_uaddr,
+       if (!ret && copy_to_user(u64_to_user_ptr(params.session_uaddr),
                        session_data, params.session_len)) {
                ret = -EFAULT;
                goto e_free_amd_cert;
@@ -1341,7 +1341,7 @@ static int sev_send_start(struct kvm *kvm, struct kvm_sev_cmd *argp)
 
        params.policy = data.policy;
        params.session_len = data.session_len;
-       if (copy_to_user((void __user *)(uintptr_t)argp->data, &params,
+       if (copy_to_user(u64_to_user_ptr(argp->data), &params,
                                sizeof(struct kvm_sev_send_start)))
                ret = -EFAULT;
 
@@ -1372,7 +1372,7 @@ __sev_send_update_data_query_lengths(struct kvm *kvm, struct kvm_sev_cmd *argp,
        params->hdr_len = data.hdr_len;
        params->trans_len = data.trans_len;
 
-       if (copy_to_user((void __user *)(uintptr_t)argp->data, params,
+       if (copy_to_user(u64_to_user_ptr(argp->data), params,
                         sizeof(struct kvm_sev_send_update_data)))
                ret = -EFAULT;
 
@@ -1392,7 +1392,7 @@ static int sev_send_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp)
        if (!sev_guest(kvm))
                return -ENOTTY;
 
-       if (copy_from_user(&params, (void __user *)(uintptr_t)argp->data,
+       if (copy_from_user(&params, u64_to_user_ptr(argp->data),
                        sizeof(struct kvm_sev_send_update_data)))
                return -EFAULT;
 
@@ -1443,14 +1443,14 @@ static int sev_send_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp)
                goto e_free_trans_data;
 
        /* copy transport buffer to user space */
-       if (copy_to_user((void __user *)(uintptr_t)params.trans_uaddr,
+       if (copy_to_user(u64_to_user_ptr(params.trans_uaddr),
                         trans_data, params.trans_len)) {
                ret = -EFAULT;
                goto e_free_trans_data;
        }
 
        /* Copy packet header to userspace. */
-       if (copy_to_user((void __user *)(uintptr_t)params.hdr_uaddr, hdr,
+       if (copy_to_user(u64_to_user_ptr(params.hdr_uaddr), hdr,
                         params.hdr_len))
                ret = -EFAULT;
 
@@ -1502,7 +1502,7 @@ static int sev_receive_start(struct kvm *kvm, struct kvm_sev_cmd *argp)
                return -ENOTTY;
 
        /* Get parameter from the userspace */
-       if (copy_from_user(&params, (void __user *)(uintptr_t)argp->data,
+       if (copy_from_user(&params, u64_to_user_ptr(argp->data),
                        sizeof(struct kvm_sev_receive_start)))
                return -EFAULT;
 
@@ -1544,7 +1544,7 @@ static int sev_receive_start(struct kvm *kvm, struct kvm_sev_cmd *argp)
        }
 
        params.handle = start.handle;
-       if (copy_to_user((void __user *)(uintptr_t)argp->data,
+       if (copy_to_user(u64_to_user_ptr(argp->data),
                         &params, sizeof(struct kvm_sev_receive_start))) {
                ret = -EFAULT;
                sev_unbind_asid(kvm, start.handle);
@@ -1575,7 +1575,7 @@ static int sev_receive_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp)
        if (!sev_guest(kvm))
                return -EINVAL;
 
-       if (copy_from_user(&params, (void __user *)(uintptr_t)argp->data,
+       if (copy_from_user(&params, u64_to_user_ptr(argp->data),
                        sizeof(struct kvm_sev_receive_update_data)))
                return -EFAULT;