diff options
-rw-r--r-- | net/netfilter/nf_conntrack_h323_asn1.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/netfilter/nf_conntrack_h323_asn1.c b/net/netfilter/nf_conntrack_h323_asn1.c index 6b7eaa019d4c..a869403b2294 100644 --- a/net/netfilter/nf_conntrack_h323_asn1.c +++ b/net/netfilter/nf_conntrack_h323_asn1.c | |||
@@ -555,15 +555,6 @@ int decode_seq(bitstr_t * bs, field_t * f, char *base, int level) | |||
555 | 555 | ||
556 | /* Decode the extension components */ | 556 | /* Decode the extension components */ |
557 | for (opt = 0; opt < bmp2_len; opt++, i++, son++) { | 557 | for (opt = 0; opt < bmp2_len; opt++, i++, son++) { |
558 | if (i < f->ub && son->attr & STOP) { | ||
559 | PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ", | ||
560 | son->name); | ||
561 | return H323_ERROR_STOP; | ||
562 | } | ||
563 | |||
564 | if (!((0x80000000 >> opt) & bmp2)) /* Not present */ | ||
565 | continue; | ||
566 | |||
567 | /* Check Range */ | 558 | /* Check Range */ |
568 | if (i >= f->ub) { /* Newer Version? */ | 559 | if (i >= f->ub) { /* Newer Version? */ |
569 | CHECK_BOUND(bs, 2); | 560 | CHECK_BOUND(bs, 2); |
@@ -573,6 +564,15 @@ int decode_seq(bitstr_t * bs, field_t * f, char *base, int level) | |||
573 | continue; | 564 | continue; |
574 | } | 565 | } |
575 | 566 | ||
567 | if (son->attr & STOP) { | ||
568 | PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ", | ||
569 | son->name); | ||
570 | return H323_ERROR_STOP; | ||
571 | } | ||
572 | |||
573 | if (!((0x80000000 >> opt) & bmp2)) /* Not present */ | ||
574 | continue; | ||
575 | |||
576 | CHECK_BOUND(bs, 2); | 576 | CHECK_BOUND(bs, 2); |
577 | len = get_len(bs); | 577 | len = get_len(bs); |
578 | CHECK_BOUND(bs, len); | 578 | CHECK_BOUND(bs, len); |