Attachment 46143 Details for Bug 100428

[patch] Patch for 9.3

netfilter-conntrack-expect (text/plain), 1.34 KB, created by Olaf Kirch on 2005-08-16 10:00:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olaf Kirch

Created: 2005-08-16 10:00:21 UTC

Size: 1.34 KB

patch

obsolete

>From: Stephan Scholz <sscholz@astaro.com>
>Subject: [netfilter] Fix incorrect error return in ip_conntrack_expect_related
>References: 100428
>
>ip_conntrack_expect_related() incorrectly returns an error, which can
>cause callers to free the conntrack entry. With some conntrack modules,
>this will lead to a kernel oops (currently only the PPTP module
>is known to be affected).
>
>Acked-by: okir@suse.de
>
>Index: linux-2.6.5/net/ipv4/netfilter/ip_conntrack_core.c
>===================================================================
>--- linux-2.6.5.orig/net/ipv4/netfilter/ip_conntrack_core.c
>+++ linux-2.6.5/net/ipv4/netfilter/ip_conntrack_core.c
>@@ -937,7 +937,6 @@ int ip_conntrack_expect_related(struct i
> 				struct ip_conntrack_expect *expect)
> {
> 	struct ip_conntrack_expect *old, *new;
>-	int ret = 0;
> 
> 	WRITE_LOCK(&ip_conntrack_lock);
> 	/* Because of the write lock, no reader can walk the lists,
>@@ -1019,7 +1018,6 @@ int ip_conntrack_expect_related(struct i
> 		 * related_to->expecting. 
> 		 */
> 		unexpect_related(old);
>-		ret = -EPERM;
> 	} else if (LIST_FIND(&ip_conntrack_expect_list, expect_clash,
> 			     struct ip_conntrack_expect *, &expect->tuple, 
> 			     &expect->mask)) {
>@@ -1059,7 +1057,7 @@ int ip_conntrack_expect_related(struct i
> 
> 	WRITE_UNLOCK(&ip_conntrack_lock);
> 
>-	return ret;
>+	return 0;
> }
> 
> /* Change tuple in an existing expectation */

Actions: View | Diff

Attachments on bug 100428: 44578 | 46143