[kernel] r9109 - dists/sid/linux-2.6/debian/patches/bugfix/all/stable

[Bastian Blank]

Author: waldi
Date: Mon Jul  9 12:35:31 2007
New Revision: 9109

Log:
debian/patches/bugfix/all/stable/2.6.21.6.patch: Add.


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.21.6.patch
Removed:
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.21.6.log

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.21.6.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.21.6.patch	Mon Jul  9 12:35:31 2007
@@ -0,0 +1,24 @@
+diff --git a/Makefile b/Makefile
+index e7c083b..384ad33 100644
+diff --git a/net/netfilter/nf_conntrack_h323_asn1.c b/net/netfilter/nf_conntrack_h323_asn1.c
+index f6fad71..6b7eaa0 100644
+--- a/net/netfilter/nf_conntrack_h323_asn1.c
++++ b/net/netfilter/nf_conntrack_h323_asn1.c
+@@ -518,7 +518,7 @@ int decode_seq(bitstr_t * bs, field_t * f, char *base, int level)
+ 			CHECK_BOUND(bs, 2);
+ 			len = get_len(bs);
+ 			CHECK_BOUND(bs, len);
+-			if (!base) {
++			if (!base || !(son->attr & DECODE)) {
+ 				PRINT("%*.s%s\n", (level + 1) * TAB_SIZE,
+ 				      " ", son->name);
+ 				bs->cur += len;
+@@ -704,6 +704,8 @@ int decode_choice(bitstr_t * bs, field_t * f, char *base, int level)
+ 	} else {
+ 		ext = 0;
+ 		type = get_bits(bs, f->sz);
++		if (type >= f->lb)
++			return H323_ERROR_RANGE;
+ 	}
+ 
+ 	/* Write Type */