diff options
| author | Eric Biggers <ebiggers@google.com> | 2017-12-08 15:13:27 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-03-03 15:51:48 +0000 |
| commit | e22e249c3fec3e21e21505abd811e2cf67ec5366 (patch) | |
| tree | 4df0a02ed40cc9202d5e8b8c8a24a1003ae225ce /lib | |
| parent | 7ae23b9c5c7ec75977bfb70132c925f8ccbb3b07 (diff) | |
| download | linux-stable-e22e249c3fec3e21e21505abd811e2cf67ec5366.tar.gz | |
ASN.1: check for error from ASN1_OP_END__ACT actions
commit 81a7be2cd69b412ab6aeacfe5ebf1bb6e5bce955 upstream.
asn1_ber_decoder() was ignoring errors from actions associated with the
opcodes ASN1_OP_END_SEQ_ACT, ASN1_OP_END_SET_ACT,
ASN1_OP_END_SEQ_OF_ACT, and ASN1_OP_END_SET_OF_ACT. In practice, this
meant the pkcs7_note_signed_info() action (since that was the only user
of those opcodes). Fix it by checking for the error, just like the
decoder does for actions associated with the other opcodes.
This bug allowed users to leak slab memory by repeatedly trying to add a
specially crafted "pkcs7_test" key (requires CONFIG_PKCS7_TEST_KEY).
In theory, this bug could also be used to bypass module signature
verification, by providing a PKCS#7 message that is misparsed such that
a signature's ->authattrs do not contain its ->msgdigest. But it
doesn't seem practical in normal cases, due to restrictions on the
format of the ->authattrs.
Fixes: 42d5ec27f873 ("X.509: Add an ASN.1 decoder")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: James Morris <james.l.morris@oracle.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/asn1_decoder.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c index 45e701d25e029f..c3a768ae1a40bd 100644 --- a/lib/asn1_decoder.c +++ b/lib/asn1_decoder.c @@ -427,6 +427,8 @@ next_op: else act = machine[pc + 1]; ret = actions[act](context, hdr, 0, data + tdp, len); + if (ret < 0) + return ret; } pc += asn1_op_lengths[op]; goto next_op; |