/[linux-patches]/genpatches-2.6/trunk/2.6.16/1012_linux-2.6.16.13.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.16/1012_linux-2.6.16.13.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 458 - (show annotations) (download) (as text)
Sun May 7 21:54:06 2006 UTC (14 years, 6 months ago) by dsd
File MIME type: text/x-diff
File size: 1670 byte(s)
Linux 2.6.16.13
1 diff --git a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
2 index be602e8..df67679 100644
3 --- a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
4 +++ b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
5 @@ -235,12 +235,15 @@ static int do_basic_checks(struct ip_con
6 flag = 1;
7 }
8
9 - /* Cookie Ack/Echo chunks not the first OR
10 - Init / Init Ack / Shutdown compl chunks not the only chunks */
11 - if ((sch->type == SCTP_CID_COOKIE_ACK
12 + /*
13 + * Cookie Ack/Echo chunks not the first OR
14 + * Init / Init Ack / Shutdown compl chunks not the only chunks
15 + * OR zero-length.
16 + */
17 + if (((sch->type == SCTP_CID_COOKIE_ACK
18 || sch->type == SCTP_CID_COOKIE_ECHO
19 || flag)
20 - && count !=0 ) {
21 + && count !=0) || !sch->length) {
22 DEBUGP("Basic checks failed\n");
23 return 1;
24 }
25 diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
26 index cf798e6..cd2326d 100644
27 --- a/net/netfilter/nf_conntrack_proto_sctp.c
28 +++ b/net/netfilter/nf_conntrack_proto_sctp.c
29 @@ -240,12 +240,15 @@ static int do_basic_checks(struct nf_con
30 flag = 1;
31 }
32
33 - /* Cookie Ack/Echo chunks not the first OR
34 - Init / Init Ack / Shutdown compl chunks not the only chunks */
35 - if ((sch->type == SCTP_CID_COOKIE_ACK
36 + /*
37 + * Cookie Ack/Echo chunks not the first OR
38 + * Init / Init Ack / Shutdown compl chunks not the only chunks
39 + * OR zero-length.
40 + */
41 + if (((sch->type == SCTP_CID_COOKIE_ACK
42 || sch->type == SCTP_CID_COOKIE_ECHO
43 || flag)
44 - && count !=0 ) {
45 + && count !=0) || !sch->length) {
46 DEBUGP("Basic checks failed\n");
47 return 1;
48 }

  ViewVC Help
Powered by ViewVC 1.1.20