diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-10-30 14:10:49 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-10-30 14:13:23 -0400 |
| commit | 23aad7f77fd1d1fd894c77db19f057728acacb02 (patch) | |
| tree | 15b417b998cc8270ac1ebf64d9518adfdcdd83b8 | |
| parent | e12c503006e27ceb9a7a1f94f9c4d11f2a566b45 (diff) | |
| download | kernel-23aad7f77fd1d1fd894c77db19f057728acacb02.tar.gz kernel-23aad7f77fd1d1fd894c77db19f057728acacb02.tar.xz kernel-23aad7f77fd1d1fd894c77db19f057728acacb02.zip | |
Fix module blacklist patch to not leak a reference to the blacklist keyring
| -rw-r--r-- | kernel.spec | 7 | ||||
| -rw-r--r-- | secure-boot-20121026.patch | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 07673d61f..8bbe22510 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2317,7 +2317,10 @@ fi # ||----w | # || || %changelog -* Tue Oct 30 2012 Josh Boyer <jwboyer@gmail.com> - 3.7.0-0.rc3.git0.1 +* Tue Oct 30 2012 Josh Boyer <jwboyer@redhat.com> +- Fix module blacklist patch to not leak a reference to the blacklist keyring + +* Tue Oct 30 2012 Josh Boyer <jwboyer@redhat.com> - 3.7.0-0.rc3.git0.1 - Disable debugging options. - Linux v3.7-rc3 - enable CONFIG_MEDIA_{USB,PCI}_SUPPORT (rhbz 870457) diff --git a/secure-boot-20121026.patch b/secure-boot-20121026.patch index 36ef7ba1d..1c5059431 100644 --- a/secure-boot-20121026.patch +++ b/secure-boot-20121026.patch @@ -1118,7 +1118,7 @@ index ea1b1df..602aa24 100644 + if (!IS_ERR(blacklist)) { + /* module is signed with a cert in the blacklist. reject */ + pr_err("Module key '%s' is in blacklist\n", id); -+ /*key_put(blacklist);*/ ++ key_ref_put(blacklist); + kfree(id); + return ERR_PTR(-EKEYREJECTED); + } @@ -1227,7 +1227,7 @@ index 0000000..049669d +#include <keys/asymmetric-type.h> +#include "module-internal.h" + -+static void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, unsigned long *size) ++static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, unsigned long *size) +{ + efi_status_t status; + unsigned long lsize = 4; |