netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets

[mirror_ubuntu-artful-kernel.git] / certs / load_uefi.c

diff --git a/certs/load_uefi.c b/certs/load_uefi.c
index b44e464c3ff419d13e35aa26fb2cdacddbb430a0..3d8845986019ec694f90501f08b6abc9741364d6 100644 (file)
--- a/certs/load_uefi.c
+++ b/certs/load_uefi.c
@@ -12,6 +12,26 @@ static __initdata efi_guid_t efi_cert_x509_guid = EFI_CERT_X509_GUID;
 static __initdata efi_guid_t efi_cert_x509_sha256_guid = EFI_CERT_X509_SHA256_GUID;
 static __initdata efi_guid_t efi_cert_sha256_guid = EFI_CERT_SHA256_GUID;
 
+/*
+ * Look to see if a UEFI variable called MokIgnoreDB exists and return true if
+ * it does.
+ *
+ * This UEFI variable is set by the shim if a user tells the shim to not use
+ * the certs/hashes in the UEFI db variable for verification purposes.  If it
+ * is set, we should ignore the db variable also and the true return indicates
+ * this.
+ */
+static __init bool uefi_check_ignore_db(void)
+{
+       efi_status_t status;
+       unsigned int db = 0;
+       unsigned long size = sizeof(db);
+       efi_guid_t guid = EFI_SHIM_LOCK_GUID;
+
+       status = efi.get_variable(L"MokIgnoreDB", &guid, NULL, &size, &db);
+       return status == EFI_SUCCESS;
+}
+
 /*
  * Get a certificate list blob from the named EFI variable.
  */
@@ -113,7 +133,9 @@ static __init efi_element_handler_t get_handler_for_dbx(const efi_guid_t *sig_ty
 }
 
 /*
- * Load the certs contained in the UEFI databases
+ * Load the certs contained in the UEFI databases into the secondary trusted
+ * keyring and the UEFI blacklisted X.509 cert SHA256 hashes into the blacklist
+ * keyring.
  */
 static int __init load_uefi_certs(void)
 {
@@ -129,15 +151,17 @@ static int __init load_uefi_certs(void)
        /* Get db, MokListRT, and dbx.  They might not exist, so it isn't
         * an error if we can't get them.
         */
-       db = get_cert_list(L"db", &secure_var, &dbsize);
-       if (!db) {
-               pr_err("MODSIGN: Couldn't get UEFI db list\n");
-       } else {
-               rc = parse_efi_signature_list("UEFI:db",
-                                             db, dbsize, get_handler_for_db);
-               if (rc)
-                       pr_err("Couldn't parse db signatures: %d\n", rc);
-               kfree(db);
+       if (!uefi_check_ignore_db()) {
+               db = get_cert_list(L"db", &secure_var, &dbsize);
+               if (!db) {
+                       pr_err("MODSIGN: Couldn't get UEFI db list\n");
+               } else {
+                       rc = parse_efi_signature_list("UEFI:db",
+                                                     db, dbsize, get_handler_for_db);
+                       if (rc)
+                               pr_err("Couldn't parse db signatures: %d\n", rc);
+                       kfree(db);
+               }
        }
 
        mok = get_cert_list(L"MokListRT", &mok_var, &moksize);