SOURCES (LINUX_2_6): linux-2.6-nf-u32.patch - fix missing spin_unl...

pluto pluto at pld-linux.org
Fri Nov 25 04:24:35 CET 2005


Author: pluto                        Date: Fri Nov 25 03:24:35 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- fix missing spin_unlock_bh in exit path in u32 (Pablo Neira Ayuso).

---- Files affected:
SOURCES:
   linux-2.6-nf-u32.patch (1.1.2.5 -> 1.1.2.6) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-nf-u32.patch
diff -u SOURCES/linux-2.6-nf-u32.patch:1.1.2.5 SOURCES/linux-2.6-nf-u32.patch:1.1.2.6
--- SOURCES/linux-2.6-nf-u32.patch:1.1.2.5	Wed Nov  2 12:19:40 2005
+++ SOURCES/linux-2.6-nf-u32.patch	Fri Nov 25 04:24:30 2005
@@ -78,7 +78,7 @@
 diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/ipt_u32.c linux-2.6.14/net/ipv4/netfilter/ipt_u32.c
 --- linux-2.6.14.org/net/ipv4/netfilter/ipt_u32.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.14/net/ipv4/netfilter/ipt_u32.c	2005-10-28 14:47:05.000000000 +0200
-@@ -0,0 +1,230 @@
+@@ -0,0 +1,233 @@
 +/* Kernel module to match u32 packet content. */
 +
 +/* 
@@ -247,8 +247,10 @@
 +			case IPT_U32_AT:
 +				AttPos += val;
 +				pos = number;
-+				if (AttPos + pos + 3 > skb->len || AttPos + pos < 0) 
++				if (AttPos + pos + 3 > skb->len || AttPos + pos < 0) {
++					spin_unlock_bh(&u32_lock);
 +					return 0;
++				}
 +
 +				val = (base[AttPos + pos]<<24) 
 +				     +(base[AttPos + pos + 1]<<16)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-nf-u32.patch?r1=1.1.2.5&r2=1.1.2.6&f=u




More information about the pld-cvs-commit mailing list