Commit 9522f476 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull key signing fixes from James Morris:
 "Keyrings and modsign fixes from David Howells"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  MODSIGN: Change from CMS to PKCS#7 signing if the openssl is too old
  X.509: Don't strip leading 00's from key ID when constructing key description
  KEYS: Remove unnecessary header #inclusions from extract-cert.c
  KEYS: Fix race between key destruction and finding a keyring by name
parents dd36d739 02667151
...@@ -43,7 +43,7 @@ o udev 081 # udevd --version ...@@ -43,7 +43,7 @@ o udev 081 # udevd --version
o grub 0.93 # grub --version || grub-install --version o grub 0.93 # grub --version || grub-install --version
o mcelog 0.6 # mcelog --version o mcelog 0.6 # mcelog --version
o iptables 1.4.2 # iptables -V o iptables 1.4.2 # iptables -V
o openssl & libcrypto 1.0.1k # openssl version o openssl & libcrypto 1.0.0 # openssl version
Kernel compilation Kernel compilation
......
...@@ -332,10 +332,6 @@ static int x509_key_preparse(struct key_preparsed_payload *prep) ...@@ -332,10 +332,6 @@ static int x509_key_preparse(struct key_preparsed_payload *prep)
srlen = cert->raw_serial_size; srlen = cert->raw_serial_size;
q = cert->raw_serial; q = cert->raw_serial;
} }
if (srlen > 1 && *q == 0) {
srlen--;
q++;
}
ret = -ENOMEM; ret = -ENOMEM;
desc = kmalloc(sulen + 2 + srlen * 2 + 1, GFP_KERNEL); desc = kmalloc(sulen + 2 + srlen * 2 + 1, GFP_KERNEL);
......
...@@ -17,13 +17,9 @@ ...@@ -17,13 +17,9 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
#include <getopt.h>
#include <err.h> #include <err.h>
#include <arpa/inet.h>
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/pkcs7.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/engine.h> #include <openssl/engine.h>
......
...@@ -20,13 +20,34 @@ ...@@ -20,13 +20,34 @@
#include <getopt.h> #include <getopt.h>
#include <err.h> #include <err.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <openssl/opensslv.h>
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/cms.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/engine.h> #include <openssl/engine.h>
/*
* Use CMS if we have openssl-1.0.0 or newer available - otherwise we have to
* assume that it's not available and its header file is missing and that we
* should use PKCS#7 instead. Switching to the older PKCS#7 format restricts
* the options we have on specifying the X.509 certificate we want.
*
* Further, older versions of OpenSSL don't support manually adding signers to
* the PKCS#7 message so have to accept that we get a certificate included in
* the signature message. Nor do such older versions of OpenSSL support
* signing with anything other than SHA1 - so we're stuck with that if such is
* the case.
*/
#if OPENSSL_VERSION_NUMBER < 0x10000000L
#define USE_PKCS7
#endif
#ifndef USE_PKCS7
#include <openssl/cms.h>
#else
#include <openssl/pkcs7.h>
#endif
struct module_signature { struct module_signature {
uint8_t algo; /* Public-key crypto algorithm [0] */ uint8_t algo; /* Public-key crypto algorithm [0] */
uint8_t hash; /* Digest algorithm [0] */ uint8_t hash; /* Digest algorithm [0] */
...@@ -110,30 +131,42 @@ int main(int argc, char **argv) ...@@ -110,30 +131,42 @@ int main(int argc, char **argv)
struct module_signature sig_info = { .id_type = PKEY_ID_PKCS7 }; struct module_signature sig_info = { .id_type = PKEY_ID_PKCS7 };
char *hash_algo = NULL; char *hash_algo = NULL;
char *private_key_name, *x509_name, *module_name, *dest_name; char *private_key_name, *x509_name, *module_name, *dest_name;
bool save_cms = false, replace_orig; bool save_sig = false, replace_orig;
bool sign_only = false; bool sign_only = false;
unsigned char buf[4096]; unsigned char buf[4096];
unsigned long module_size, cms_size; unsigned long module_size, sig_size;
unsigned int use_keyid = 0, use_signed_attrs = CMS_NOATTR; unsigned int use_signed_attrs;
const EVP_MD *digest_algo; const EVP_MD *digest_algo;
EVP_PKEY *private_key; EVP_PKEY *private_key;
#ifndef USE_PKCS7
CMS_ContentInfo *cms; CMS_ContentInfo *cms;
unsigned int use_keyid = 0;
#else
PKCS7 *pkcs7;
#endif
X509 *x509; X509 *x509;
BIO *b, *bd = NULL, *bm; BIO *b, *bd = NULL, *bm;
int opt, n; int opt, n;
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
ERR_load_crypto_strings(); ERR_load_crypto_strings();
ERR_clear_error(); ERR_clear_error();
key_pass = getenv("KBUILD_SIGN_PIN"); key_pass = getenv("KBUILD_SIGN_PIN");
#ifndef USE_PKCS7
use_signed_attrs = CMS_NOATTR;
#else
use_signed_attrs = PKCS7_NOATTR;
#endif
do { do {
opt = getopt(argc, argv, "dpk"); opt = getopt(argc, argv, "dpk");
switch (opt) { switch (opt) {
case 'p': save_cms = true; break; case 'p': save_sig = true; break;
case 'd': sign_only = true; save_cms = true; break; case 'd': sign_only = true; save_sig = true; break;
#ifndef USE_PKCS7
case 'k': use_keyid = CMS_USE_KEYID; break; case 'k': use_keyid = CMS_USE_KEYID; break;
#endif
case -1: break; case -1: break;
default: format(); default: format();
} }
...@@ -157,6 +190,14 @@ int main(int argc, char **argv) ...@@ -157,6 +190,14 @@ int main(int argc, char **argv)
replace_orig = true; replace_orig = true;
} }
#ifdef USE_PKCS7
if (strcmp(hash_algo, "sha1") != 0) {
fprintf(stderr, "sign-file: %s only supports SHA1 signing\n",
OPENSSL_VERSION_TEXT);
exit(3);
}
#endif
/* Read the private key and the X.509 cert the PKCS#7 message /* Read the private key and the X.509 cert the PKCS#7 message
* will point to. * will point to.
*/ */
...@@ -213,7 +254,8 @@ int main(int argc, char **argv) ...@@ -213,7 +254,8 @@ int main(int argc, char **argv)
bm = BIO_new_file(module_name, "rb"); bm = BIO_new_file(module_name, "rb");
ERR(!bm, "%s", module_name); ERR(!bm, "%s", module_name);
/* Load the CMS message from the digest buffer. */ #ifndef USE_PKCS7
/* Load the signature message from the digest buffer. */
cms = CMS_sign(NULL, NULL, NULL, NULL, cms = CMS_sign(NULL, NULL, NULL, NULL,
CMS_NOCERTS | CMS_PARTIAL | CMS_BINARY | CMS_DETACHED | CMS_STREAM); CMS_NOCERTS | CMS_PARTIAL | CMS_BINARY | CMS_DETACHED | CMS_STREAM);
ERR(!cms, "CMS_sign"); ERR(!cms, "CMS_sign");
...@@ -221,17 +263,31 @@ int main(int argc, char **argv) ...@@ -221,17 +263,31 @@ int main(int argc, char **argv)
ERR(!CMS_add1_signer(cms, x509, private_key, digest_algo, ERR(!CMS_add1_signer(cms, x509, private_key, digest_algo,
CMS_NOCERTS | CMS_BINARY | CMS_NOSMIMECAP | CMS_NOCERTS | CMS_BINARY | CMS_NOSMIMECAP |
use_keyid | use_signed_attrs), use_keyid | use_signed_attrs),
"CMS_sign_add_signer"); "CMS_add1_signer");
ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) < 0, ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) < 0,
"CMS_final"); "CMS_final");
if (save_cms) { #else
char *cms_name; pkcs7 = PKCS7_sign(x509, private_key, NULL, bm,
PKCS7_NOCERTS | PKCS7_BINARY |
PKCS7_DETACHED | use_signed_attrs);
ERR(!pkcs7, "PKCS7_sign");
#endif
ERR(asprintf(&cms_name, "%s.p7s", module_name) < 0, "asprintf"); if (save_sig) {
b = BIO_new_file(cms_name, "wb"); char *sig_file_name;
ERR(!b, "%s", cms_name);
ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) < 0, "%s", cms_name); ERR(asprintf(&sig_file_name, "%s.p7s", module_name) < 0,
"asprintf");
b = BIO_new_file(sig_file_name, "wb");
ERR(!b, "%s", sig_file_name);
#ifndef USE_PKCS7
ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) < 0,
"%s", sig_file_name);
#else
ERR(i2d_PKCS7_bio(b, pkcs7) < 0,
"%s", sig_file_name);
#endif
BIO_free(b); BIO_free(b);
} }
...@@ -247,9 +303,13 @@ int main(int argc, char **argv) ...@@ -247,9 +303,13 @@ int main(int argc, char **argv)
ERR(n < 0, "%s", module_name); ERR(n < 0, "%s", module_name);
module_size = BIO_number_written(bd); module_size = BIO_number_written(bd);
#ifndef USE_PKCS7
ERR(i2d_CMS_bio_stream(bd, cms, NULL, 0) < 0, "%s", dest_name); ERR(i2d_CMS_bio_stream(bd, cms, NULL, 0) < 0, "%s", dest_name);
cms_size = BIO_number_written(bd) - module_size; #else
sig_info.sig_len = htonl(cms_size); ERR(i2d_PKCS7_bio(bd, pkcs7) < 0, "%s", dest_name);
#endif
sig_size = BIO_number_written(bd) - module_size;
sig_info.sig_len = htonl(sig_size);
ERR(BIO_write(bd, &sig_info, sizeof(sig_info)) < 0, "%s", dest_name); ERR(BIO_write(bd, &sig_info, sizeof(sig_info)) < 0, "%s", dest_name);
ERR(BIO_write(bd, magic_number, sizeof(magic_number) - 1) < 0, "%s", dest_name); ERR(BIO_write(bd, magic_number, sizeof(magic_number) - 1) < 0, "%s", dest_name);
......
...@@ -134,6 +134,10 @@ static noinline void key_gc_unused_keys(struct list_head *keys) ...@@ -134,6 +134,10 @@ static noinline void key_gc_unused_keys(struct list_head *keys)
kdebug("- %u", key->serial); kdebug("- %u", key->serial);
key_check(key); key_check(key);
/* Throw away the key data */
if (key->type->destroy)
key->type->destroy(key);
security_key_free(key); security_key_free(key);
/* deal with the user's key tracking and quota */ /* deal with the user's key tracking and quota */
...@@ -148,10 +152,6 @@ static noinline void key_gc_unused_keys(struct list_head *keys) ...@@ -148,10 +152,6 @@ static noinline void key_gc_unused_keys(struct list_head *keys)
if (test_bit(KEY_FLAG_INSTANTIATED, &key->flags)) if (test_bit(KEY_FLAG_INSTANTIATED, &key->flags))
atomic_dec(&key->user->nikeys); atomic_dec(&key->user->nikeys);
/* now throw away the key memory */
if (key->type->destroy)
key->type->destroy(key);
key_user_put(key->user); key_user_put(key->user);
kfree(key->description); kfree(key->description);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment