Contents of /trunk/kernel26-alx/patches-2.6.20-r6/0115-2.6.20.15-all-fixes.patch
Parent Directory | Revision Log
Revision 1175 -
(show annotations)
(download)
Thu Oct 14 12:15:46 2010 UTC (13 years, 11 months ago) by niro
File size: 746 byte(s)
Thu Oct 14 12:15:46 2010 UTC (13 years, 11 months ago) by niro
File size: 746 byte(s)
-2.6.20-alx-r6 new magellan 0.5.2 kernel
1 | diff --git a/net/netfilter/nf_conntrack_h323_asn1.c b/net/netfilter/nf_conntrack_h323_asn1.c |
2 | index f6fad71..6b7eaa0 100644 |
3 | --- a/net/netfilter/nf_conntrack_h323_asn1.c |
4 | +++ b/net/netfilter/nf_conntrack_h323_asn1.c |
5 | @@ -518,7 +518,7 @@ int decode_seq(bitstr_t * bs, field_t * f, char *base, int level) |
6 | CHECK_BOUND(bs, 2); |
7 | len = get_len(bs); |
8 | CHECK_BOUND(bs, len); |
9 | - if (!base) { |
10 | + if (!base || !(son->attr & DECODE)) { |
11 | PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, |
12 | " ", son->name); |
13 | bs->cur += len; |
14 | @@ -704,6 +704,8 @@ int decode_choice(bitstr_t * bs, field_t * f, char *base, int level) |
15 | } else { |
16 | ext = 0; |
17 | type = get_bits(bs, f->sz); |
18 | + if (type >= f->lb) |
19 | + return H323_ERROR_RANGE; |
20 | } |
21 | |
22 | /* Write Type */ |