Annotation of /trunk/kernel26-alx/patches-2.6.21-r13/0105-2.6.21.6-all-fixes.patch
Parent Directory | Revision Log
Revision 445 -
(hide annotations)
(download)
Tue Jan 15 00:44:37 2008 UTC (16 years, 8 months ago) by niro
File size: 746 byte(s)
Tue Jan 15 00:44:37 2008 UTC (16 years, 8 months ago) by niro
File size: 746 byte(s)
-added patches for 2.6.21-alx-r13
1 | niro | 445 | 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 */ |