Commit 54d1ae49 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

Pull module signing fixes from Rusty Russell:
 "David gave me these a month ago, during my git workflow churn :("

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  ASN.1: Fix an indefinite length skip error
  MODSIGN: Don't use enum-type bitfields in module signature info block
parents cfd1f032 f3537f91
...@@ -27,13 +27,13 @@ ...@@ -27,13 +27,13 @@
* - Information block * - Information block
*/ */
struct module_signature { struct module_signature {
enum pkey_algo algo : 8; /* Public-key crypto algorithm */ u8 algo; /* Public-key crypto algorithm [enum pkey_algo] */
enum pkey_hash_algo hash : 8; /* Digest algorithm */ u8 hash; /* Digest algorithm [enum pkey_hash_algo] */
enum pkey_id_type id_type : 8; /* Key identifier type */ u8 id_type; /* Key identifier type [enum pkey_id_type] */
u8 signer_len; /* Length of signer's name */ u8 signer_len; /* Length of signer's name */
u8 key_id_len; /* Length of key identifier */ u8 key_id_len; /* Length of key identifier */
u8 __pad[3]; u8 __pad[3];
__be32 sig_len; /* Length of signature data */ __be32 sig_len; /* Length of signature data */
}; };
/* /*
......
...@@ -91,7 +91,7 @@ static int asn1_find_indefinite_length(const unsigned char *data, size_t datalen ...@@ -91,7 +91,7 @@ static int asn1_find_indefinite_length(const unsigned char *data, size_t datalen
/* Extract the length */ /* Extract the length */
len = data[dp++]; len = data[dp++];
if (len < 0x7f) { if (len <= 0x7f) {
dp += len; dp += len;
goto next_tag; goto next_tag;
} }
......
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