]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
UBUNTU: SAUCE: (efi-lockdown) MODSIGN: Fix module signature verification
authorFedora Kernel Team <kernel-team@fedoraproject.org>
Thu, 3 Aug 2017 18:46:51 +0000 (13:46 -0500)
committerSeth Forshee <seth.forshee@canonical.com>
Tue, 5 Sep 2017 12:34:41 +0000 (07:34 -0500)
commit1616036c0b467867b146cfd8f4bcba180f8a9b75
treeb1934bb8c26f186b3d1fb5c8a3e9058de5aaf0b6
parentc73f8400734f0d56c65cfb51edeb40d5ef2a9387
UBUNTU: SAUCE: (efi-lockdown) MODSIGN: Fix module signature verification

BugLink: http://bugs.launchpad.net/bugs/1712168
Currently mod_verify_sig() calls verify_pkcs_7_signature() with
trusted_keys=NULL, which causes only the builtin keys to be used
to verify the signature. This breaks self-signing of modules with
a MOK, as the MOK is loaded into the secondary trusted keyring.
Fix this by passing the spacial value trusted_keys=(void *)1UL,
which tells verify_pkcs_7_signature() to use the secondary
keyring instead.

(cherry picked from commit cff4523d65b848f9c41c9e998a735ae2a820da2d
 git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/fedora.git)
[ saf: Taken from fedora commit without authorship information or much
  of a commit message; modified so that commit will describe the
  problem being fixed. ]
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
kernel/module_signing.c