Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 81895
b: refs/heads/master
c: 34bd137
h: refs/heads/master
i:
  81893: 1f6538c
  81891: 0d4864a
  81887: e6d1192
v: v3
  • Loading branch information
Alexey Dobriyan authored and David S. Miller committed Feb 1, 2008
1 parent 86d4628 commit 144d987
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 23 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 44d34e721e2c81ccdfb13cf34996309247ae2981
refs/heads/master: 34bd137ba744c2e3a320ff50ac64ae51556cdfae
45 changes: 23 additions & 22 deletions trunk/net/ipv4/netfilter/ip_tables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,7 @@ static int compat_table_info(const struct xt_table_info *info,
}
#endif

static int get_info(void __user *user, int *len, int compat)
static int get_info(struct net *net, void __user *user, int *len, int compat)
{
char name[IPT_TABLE_MAXNAMELEN];
struct xt_table *t;
Expand All @@ -1112,7 +1112,7 @@ static int get_info(void __user *user, int *len, int compat)
if (compat)
xt_compat_lock(AF_INET);
#endif
t = try_then_request_module(xt_find_table_lock(&init_net, AF_INET, name),
t = try_then_request_module(xt_find_table_lock(net, AF_INET, name),
"iptable_%s", name);
if (t && !IS_ERR(t)) {
struct ipt_getinfo info;
Expand Down Expand Up @@ -1152,7 +1152,7 @@ static int get_info(void __user *user, int *len, int compat)
}

static int
get_entries(struct ipt_get_entries __user *uptr, int *len)
get_entries(struct net *net, struct ipt_get_entries __user *uptr, int *len)
{
int ret;
struct ipt_get_entries get;
Expand All @@ -1170,7 +1170,7 @@ get_entries(struct ipt_get_entries __user *uptr, int *len)
return -EINVAL;
}

t = xt_find_table_lock(&init_net, AF_INET, get.name);
t = xt_find_table_lock(net, AF_INET, get.name);
if (t && !IS_ERR(t)) {
struct xt_table_info *private = t->private;
duprintf("t->private->number = %u\n", private->number);
Expand All @@ -1191,7 +1191,7 @@ get_entries(struct ipt_get_entries __user *uptr, int *len)
}

static int
__do_replace(const char *name, unsigned int valid_hooks,
__do_replace(struct net *net, const char *name, unsigned int valid_hooks,
struct xt_table_info *newinfo, unsigned int num_counters,
void __user *counters_ptr)
{
Expand All @@ -1208,7 +1208,7 @@ __do_replace(const char *name, unsigned int valid_hooks,
goto out;
}

t = try_then_request_module(xt_find_table_lock(&init_net, AF_INET, name),
t = try_then_request_module(xt_find_table_lock(net, AF_INET, name),
"iptable_%s", name);
if (!t || IS_ERR(t)) {
ret = t ? PTR_ERR(t) : -ENOENT;
Expand Down Expand Up @@ -1261,7 +1261,7 @@ __do_replace(const char *name, unsigned int valid_hooks,
}

static int
do_replace(void __user *user, unsigned int len)
do_replace(struct net *net, void __user *user, unsigned int len)
{
int ret;
struct ipt_replace tmp;
Expand Down Expand Up @@ -1295,7 +1295,7 @@ do_replace(void __user *user, unsigned int len)

duprintf("ip_tables: Translated table\n");

ret = __do_replace(tmp.name, tmp.valid_hooks, newinfo,
ret = __do_replace(net, tmp.name, tmp.valid_hooks, newinfo,
tmp.num_counters, tmp.counters);
if (ret)
goto free_newinfo_untrans;
Expand Down Expand Up @@ -1331,7 +1331,7 @@ add_counter_to_entry(struct ipt_entry *e,
}

static int
do_add_counters(void __user *user, unsigned int len, int compat)
do_add_counters(struct net *net, void __user *user, unsigned int len, int compat)
{
unsigned int i;
struct xt_counters_info tmp;
Expand Down Expand Up @@ -1383,7 +1383,7 @@ do_add_counters(void __user *user, unsigned int len, int compat)
goto free;
}

t = xt_find_table_lock(&init_net, AF_INET, name);
t = xt_find_table_lock(net, AF_INET, name);
if (!t || IS_ERR(t)) {
ret = t ? PTR_ERR(t) : -ENOENT;
goto free;
Expand Down Expand Up @@ -1789,7 +1789,7 @@ translate_compat_table(const char *name,
}

static int
compat_do_replace(void __user *user, unsigned int len)
compat_do_replace(struct net *net, void __user *user, unsigned int len)
{
int ret;
struct compat_ipt_replace tmp;
Expand Down Expand Up @@ -1826,7 +1826,7 @@ compat_do_replace(void __user *user, unsigned int len)

duprintf("compat_do_replace: Translated table\n");

ret = __do_replace(tmp.name, tmp.valid_hooks, newinfo,
ret = __do_replace(net, tmp.name, tmp.valid_hooks, newinfo,
tmp.num_counters, compat_ptr(tmp.counters));
if (ret)
goto free_newinfo_untrans;
Expand All @@ -1850,11 +1850,11 @@ compat_do_ipt_set_ctl(struct sock *sk, int cmd, void __user *user,

switch (cmd) {
case IPT_SO_SET_REPLACE:
ret = compat_do_replace(user, len);
ret = compat_do_replace(sk->sk_net, user, len);
break;

case IPT_SO_SET_ADD_COUNTERS:
ret = do_add_counters(user, len, 1);
ret = do_add_counters(sk->sk_net, user, len, 1);
break;

default:
Expand Down Expand Up @@ -1903,7 +1903,8 @@ compat_copy_entries_to_user(unsigned int total_size, struct xt_table *table,
}

static int
compat_get_entries(struct compat_ipt_get_entries __user *uptr, int *len)
compat_get_entries(struct net *net, struct compat_ipt_get_entries __user *uptr,
int *len)
{
int ret;
struct compat_ipt_get_entries get;
Expand All @@ -1924,7 +1925,7 @@ compat_get_entries(struct compat_ipt_get_entries __user *uptr, int *len)
}

xt_compat_lock(AF_INET);
t = xt_find_table_lock(&init_net, AF_INET, get.name);
t = xt_find_table_lock(net, AF_INET, get.name);
if (t && !IS_ERR(t)) {
struct xt_table_info *private = t->private;
struct xt_table_info info;
Expand Down Expand Up @@ -1960,10 +1961,10 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)

switch (cmd) {
case IPT_SO_GET_INFO:
ret = get_info(user, len, 1);
ret = get_info(sk->sk_net, user, len, 1);
break;
case IPT_SO_GET_ENTRIES:
ret = compat_get_entries(user, len);
ret = compat_get_entries(sk->sk_net, user, len);
break;
default:
ret = do_ipt_get_ctl(sk, cmd, user, len);
Expand All @@ -1982,11 +1983,11 @@ do_ipt_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)

switch (cmd) {
case IPT_SO_SET_REPLACE:
ret = do_replace(user, len);
ret = do_replace(sk->sk_net, user, len);
break;

case IPT_SO_SET_ADD_COUNTERS:
ret = do_add_counters(user, len, 0);
ret = do_add_counters(sk->sk_net, user, len, 0);
break;

default:
Expand All @@ -2007,11 +2008,11 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)

switch (cmd) {
case IPT_SO_GET_INFO:
ret = get_info(user, len, 0);
ret = get_info(sk->sk_net, user, len, 0);
break;

case IPT_SO_GET_ENTRIES:
ret = get_entries(user, len);
ret = get_entries(sk->sk_net, user, len);
break;

case IPT_SO_GET_REVISION_MATCH:
Expand Down

0 comments on commit 144d987

Please sign in to comment.