1 files changed, 23 insertions, 4 deletions

diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c
index 1a000bb050f9..2b3f46c049d4 100644
--- a/lib/asn1_decoder.c
+++ b/lib/asn1_decoder.c
@@ -24,15 +24,20 @@ static const unsigned char asn1_op_lengths[ASN1_OP__NR] = {
         [ASN1_OP_MATCH_JUMP]                    = 1 + 1 + 1,
         [ASN1_OP_MATCH_JUMP_OR_SKIP]            = 1 + 1 + 1,
         [ASN1_OP_MATCH_ANY]                     = 1,
+        [ASN1_OP_MATCH_ANY_OR_SKIP]             = 1,
         [ASN1_OP_MATCH_ANY_ACT]                 = 1         + 1,
+        [ASN1_OP_MATCH_ANY_ACT_OR_SKIP]         = 1         + 1,
         [ASN1_OP_COND_MATCH_OR_SKIP]            = 1 + 1,
         [ASN1_OP_COND_MATCH_ACT_OR_SKIP]        = 1 + 1     + 1,
         [ASN1_OP_COND_MATCH_JUMP_OR_SKIP]       = 1 + 1 + 1,
         [ASN1_OP_COND_MATCH_ANY]                = 1,
+        [ASN1_OP_COND_MATCH_ANY_OR_SKIP]        = 1,
         [ASN1_OP_COND_MATCH_ANY_ACT]            = 1         + 1,
+        [ASN1_OP_COND_MATCH_ANY_ACT_OR_SKIP]    = 1         + 1,
         [ASN1_OP_COND_FAIL]                     = 1,
         [ASN1_OP_COMPLETE]                      = 1,
         [ASN1_OP_ACT]                           = 1         + 1,
+        [ASN1_OP_MAYBE_ACT]                     = 1         + 1,
         [ASN1_OP_RETURN]                        = 1,
         [ASN1_OP_END_SEQ]                       = 1,
         [ASN1_OP_END_SEQ_OF]                    = 1     + 1,
@@ -177,6 +182,7 @@ int asn1_ber_decoder(const struct asn1_decoder *decoder,
         unsigned char flags = 0;
 #define FLAG_INDEFINITE_LENGTH  0x01
 #define FLAG_MATCHED            0x02
+#define FLAG_LAST_MATCHED       0x04 /* Last tag matched */
 #define FLAG_CONS               0x20 /* Corresponds to CONS bit in the opcode tag
                                       * - ie. whether or not we are going to parse
                                       *   a compound type.
@@ -208,9 +214,9 @@ next_op:
                 unsigned char tmp;
 
                 /* Skip conditional matches if possible */
-                if ((op & ASN1_OP_MATCH__COND &&
-                     flags & FLAG_MATCHED) ||
-                    dp == datalen) {
+                if ((op & ASN1_OP_MATCH__COND && flags & FLAG_MATCHED) ||
+                    (op & ASN1_OP_MATCH__SKIP && dp == datalen)) {
+                        flags &= ~FLAG_LAST_MATCHED;
                         pc += asn1_op_lengths[op];
                         goto next_op;
                 }
@@ -302,7 +308,9 @@ next_op:
         /* Decide how to handle the operation */
         switch (op) {
         case ASN1_OP_MATCH_ANY_ACT:
+        case ASN1_OP_MATCH_ANY_ACT_OR_SKIP:
         case ASN1_OP_COND_MATCH_ANY_ACT:
+        case ASN1_OP_COND_MATCH_ANY_ACT_OR_SKIP:
                 ret = actions[machine[pc + 1]](context, hdr, tag, data + dp, len);
                 if (ret < 0)
                         return ret;
@@ -319,8 +327,10 @@ next_op:
         case ASN1_OP_MATCH:
         case ASN1_OP_MATCH_OR_SKIP:
         case ASN1_OP_MATCH_ANY:
+        case ASN1_OP_MATCH_ANY_OR_SKIP:
         case ASN1_OP_COND_MATCH_OR_SKIP:
         case ASN1_OP_COND_MATCH_ANY:
+        case ASN1_OP_COND_MATCH_ANY_OR_SKIP:
         skip_data:
                 if (!(flags & FLAG_CONS)) {
                         if (flags & FLAG_INDEFINITE_LENGTH) {
@@ -422,8 +432,15 @@ next_op:
                 pc += asn1_op_lengths[op];
                 goto next_op;
 
+        case ASN1_OP_MAYBE_ACT:
+                if (!(flags & FLAG_LAST_MATCHED)) {
+                        pc += asn1_op_lengths[op];
+                        goto next_op;
+                }
         case ASN1_OP_ACT:
                 ret = actions[machine[pc + 1]](context, hdr, tag, data + tdp, len);
+                if (ret < 0)
+                        return ret;
                 pc += asn1_op_lengths[op];
                 goto next_op;
 
@@ -431,6 +448,7 @@ next_op:
                 if (unlikely(jsp <= 0))
                         goto jump_stack_underflow;
                 pc = jump_stack[--jsp];
+                flags |= FLAG_MATCHED | FLAG_LAST_MATCHED;
                 goto next_op;
 
         default:
@@ -438,7 +456,8 @@ next_op:
         }
 
         /* Shouldn't reach here */
-        pr_err("ASN.1 decoder error: Found reserved opcode (%u)\n", op);
+        pr_err("ASN.1 decoder error: Found reserved opcode (%u) pc=%zu\n",
+               op, pc);
         return -EBADMSG;
 
 data_overrun_error: