On 10/13/2017 09:53 AM, Borislav Petkov wrote:
...

- if (copy_from_user(data, (void __user *)(uintptr_t)uaddr, len))
+       if (copy_from_user(data, (void __user *)uaddr, len))
                goto e_free;


IIRC, typecast was needed for i386 build, but now we have depends on X86_64 hence I will go ahead and remove the typecast from all other places.


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;

Reply via email to