2006-12-15 01:41:53

by Chris Wright

[permalink] [raw]
Subject: [patch 08/24] NETFILTER: ip_tables: revision support for compat code

2.6.18-stable review patch. If anyone has any objections, please let us know.
------------------

From: Patrick McHardy <[email protected]>

---
commit 79030ed07de673e8451a03aecb9ada9f4d75d491
tree 4ba8bd843c8bc95db0ea6877880b73d06da620e5
parent bec71b162747708d4b45b0cd399b484f52f2901a
author Patrick McHardy <[email protected]> Wed, 20 Sep 2006 12:05:08 -0700
committer David S. Miller <[email protected]> Fri, 22 Sep 2006 15:20:00 -0700

net/ipv4/netfilter/ip_tables.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

--- linux-2.6.18.5.orig/net/ipv4/netfilter/ip_tables.c
+++ linux-2.6.18.5/net/ipv4/netfilter/ip_tables.c
@@ -1989,6 +1989,8 @@ compat_get_entries(struct compat_ipt_get
return ret;
}

+static int do_ipt_get_ctl(struct sock *, int, void __user *, int *);
+
static int
compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
{
@@ -2005,8 +2007,7 @@ compat_do_ipt_get_ctl(struct sock *sk, i
ret = compat_get_entries(user, len);
break;
default:
- duprintf("compat_do_ipt_get_ctl: unknown request %i\n", cmd);
- ret = -EINVAL;
+ ret = do_ipt_get_ctl(sk, cmd, user, len);
}
return ret;
}

--