OSDN Git Service

nitro_enclaves: Add logic for getting the enclave image load info
authorAndra Paraschiv <andraprs@amazon.com>
Mon, 21 Sep 2020 12:17:24 +0000 (15:17 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 22 Sep 2020 11:58:41 +0000 (13:58 +0200)
Before setting the memory regions for the enclave, the enclave image
needs to be placed in memory. After the memory regions are set, this
memory cannot be used anymore by the VM, being carved out.

Add ioctl command logic to get the offset in enclave memory where to
place the enclave image. Then the user space tooling copies the enclave
image in the memory using the given memory offset.

Changelog

v9 -> v10

* Update commit message to include the changelog before the SoB tag(s).

v8 -> v9

* No changes.

v7 -> v8

* Add custom error code for incorrect enclave image load info flag.

v6 -> v7

* No changes.

v5 -> v6

* Check for invalid enclave image load flags.

v4 -> v5

* Check for the enclave not being started when invoking this ioctl call.
* Remove log on copy_from_user() / copy_to_user() failure.

v3 -> v4

* Use dev_err instead of custom NE log pattern.
* Set enclave image load offset based on flags.
* Update the naming for the ioctl command from metadata to info.

v2 -> v3

* No changes.

v1 -> v2

* New in v2.

Reviewed-by: Alexander Graf <graf@amazon.com>
Signed-off-by: Andra Paraschiv <andraprs@amazon.com>
Link: https://lore.kernel.org/r/20200921121732.44291-11-andraprs@amazon.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/virt/nitro_enclaves/ne_misc_dev.c

index 24e4270..fe83588 100644 (file)
@@ -807,6 +807,42 @@ static long ne_enclave_ioctl(struct file *file, unsigned int cmd, unsigned long
                return 0;
        }
 
+       case NE_GET_IMAGE_LOAD_INFO: {
+               struct ne_image_load_info image_load_info = {};
+
+               if (copy_from_user(&image_load_info, (void __user *)arg, sizeof(image_load_info)))
+                       return -EFAULT;
+
+               mutex_lock(&ne_enclave->enclave_info_mutex);
+
+               if (ne_enclave->state != NE_STATE_INIT) {
+                       dev_err_ratelimited(ne_misc_dev.this_device,
+                                           "Enclave is not in init state\n");
+
+                       mutex_unlock(&ne_enclave->enclave_info_mutex);
+
+                       return -NE_ERR_NOT_IN_INIT_STATE;
+               }
+
+               mutex_unlock(&ne_enclave->enclave_info_mutex);
+
+               if (!image_load_info.flags ||
+                   image_load_info.flags >= NE_IMAGE_LOAD_MAX_FLAG_VAL) {
+                       dev_err_ratelimited(ne_misc_dev.this_device,
+                                           "Incorrect flag in enclave image load info\n");
+
+                       return -NE_ERR_INVALID_FLAG_VALUE;
+               }
+
+               if (image_load_info.flags == NE_EIF_IMAGE)
+                       image_load_info.memory_offset = NE_EIF_LOAD_OFFSET;
+
+               if (copy_to_user((void __user *)arg, &image_load_info, sizeof(image_load_info)))
+                       return -EFAULT;
+
+               return 0;
+       }
+
        default:
                return -ENOTTY;
        }