Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 78512
b: refs/heads/master
c: 9c54795
h: refs/heads/master
v: v3
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Jan 28, 2008
1 parent 1f9bccf commit d84682f
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 60 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: 1fe5723773656a8ee7a981caf7fee9adb0ac6259
refs/heads/master: 9c54795950d198e77144a18c94e7ed52ea0f3c77
66 changes: 30 additions & 36 deletions trunk/net/ipv4/netfilter/ip_tables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ do { \
Hence the start of any table is given by get_table() below. */

/* Returns whether matches rule or not. */
static inline int
static inline bool
ip_packet_match(const struct iphdr *ip,
const char *indev,
const char *outdev,
Expand Down Expand Up @@ -102,7 +102,7 @@ ip_packet_match(const struct iphdr *ip,
NIPQUAD(ipinfo->dmsk.s_addr),
NIPQUAD(ipinfo->dst.s_addr),
ipinfo->invflags & IPT_INV_DSTIP ? " (INV)" : "");
return 0;
return false;
}

/* Look for ifname matches; this should unroll nicely. */
Expand All @@ -116,7 +116,7 @@ ip_packet_match(const struct iphdr *ip,
dprintf("VIA in mismatch (%s vs %s).%s\n",
indev, ipinfo->iniface,
ipinfo->invflags&IPT_INV_VIA_IN ?" (INV)":"");
return 0;
return false;
}

for (i = 0, ret = 0; i < IFNAMSIZ/sizeof(unsigned long); i++) {
Expand All @@ -129,7 +129,7 @@ ip_packet_match(const struct iphdr *ip,
dprintf("VIA out mismatch (%s vs %s).%s\n",
outdev, ipinfo->outiface,
ipinfo->invflags&IPT_INV_VIA_OUT ?" (INV)":"");
return 0;
return false;
}

/* Check specific protocol */
Expand All @@ -138,18 +138,18 @@ ip_packet_match(const struct iphdr *ip,
dprintf("Packet protocol %hi does not match %hi.%s\n",
ip->protocol, ipinfo->proto,
ipinfo->invflags&IPT_INV_PROTO ? " (INV)":"");
return 0;
return false;
}

/* If we have a fragment rule but the packet is not a fragment
* then we return zero */
if (FWINV((ipinfo->flags&IPT_F_FRAG) && !isfrag, IPT_INV_FRAG)) {
dprintf("Fragment rule but not fragment.%s\n",
ipinfo->invflags & IPT_INV_FRAG ? " (INV)" : "");
return 0;
return false;
}

return 1;
return true;
}

static inline bool
Expand Down Expand Up @@ -222,7 +222,7 @@ unconditional(const struct ipt_ip *ip)
static const char *hooknames[] = {
[NF_INET_PRE_ROUTING] = "PREROUTING",
[NF_INET_LOCAL_IN] = "INPUT",
[NF_INET_FORWARD] = "FORWARD",
[NF_INET_FORWARD] = "FORWARD",
[NF_INET_LOCAL_OUT] = "OUTPUT",
[NF_INET_POST_ROUTING] = "POSTROUTING",
};
Expand Down Expand Up @@ -467,8 +467,7 @@ mark_source_chains(struct xt_table_info *newinfo,
to 0 as we leave), and comefrom to save source hook bitmask */
for (hook = 0; hook < NF_INET_NUMHOOKS; hook++) {
unsigned int pos = newinfo->hook_entry[hook];
struct ipt_entry *e
= (struct ipt_entry *)(entry0 + pos);
struct ipt_entry *e = (struct ipt_entry *)(entry0 + pos);

if (!(valid_hooks & (1 << hook)))
continue;
Expand All @@ -486,8 +485,7 @@ mark_source_chains(struct xt_table_info *newinfo,
hook, pos, e->comefrom);
return 0;
}
e->comefrom
|= ((1 << hook) | (1 << NF_INET_NUMHOOKS));
e->comefrom |= ((1 << hook) | (1 << NF_INET_NUMHOOKS));

/* Unconditional return/END. */
if ((e->target_offset == sizeof(struct ipt_entry)
Expand Down Expand Up @@ -589,7 +587,8 @@ check_entry(struct ipt_entry *e, const char *name)
return -EINVAL;
}

if (e->target_offset + sizeof(struct ipt_entry_target) > e->next_offset)
if (e->target_offset + sizeof(struct ipt_entry_target) >
e->next_offset)
return -EINVAL;

t = ipt_get_target(e);
Expand Down Expand Up @@ -633,7 +632,7 @@ find_check_match(struct ipt_entry_match *m,
int ret;

match = try_then_request_module(xt_find_match(AF_INET, m->u.user.name,
m->u.user.revision),
m->u.user.revision),
"ipt_%s", m->u.user.name);
if (IS_ERR(match) || !match) {
duprintf("find_check_match: `%s' not found\n", m->u.user.name);
Expand Down Expand Up @@ -959,7 +958,6 @@ copy_entries_to_user(unsigned int total_size,
* allowed to migrate to another cpu)
*/
loc_cpu_entry = private->entries[raw_smp_processor_id()];
/* ... then copy entire thing ... */
if (copy_to_user(userptr, loc_cpu_entry, total_size) != 0) {
ret = -EFAULT;
goto free_counters;
Expand Down Expand Up @@ -1169,15 +1167,13 @@ get_entries(struct ipt_get_entries __user *uptr, int *len)
t = xt_find_table_lock(AF_INET, get.name);
if (t && !IS_ERR(t)) {
struct xt_table_info *private = t->private;
duprintf("t->private->number = %u\n",
private->number);
duprintf("t->private->number = %u\n", private->number);
if (get.size == private->size)
ret = copy_entries_to_user(private->size,
t, uptr->entrytable);
else {
duprintf("get_entries: I've got %u not %u!\n",
private->size,
get.size);
private->size, get.size);
ret = -EINVAL;
}
module_put(t->me);
Expand Down Expand Up @@ -1281,7 +1277,7 @@ do_replace(void __user *user, unsigned int len)
if (!newinfo)
return -ENOMEM;

/* choose the copy that is our node/cpu */
/* choose the copy that is on our node/cpu */
loc_cpu_entry = newinfo->entries[raw_smp_processor_id()];
if (copy_from_user(loc_cpu_entry, user + sizeof(tmp),
tmp.size) != 0) {
Expand All @@ -1304,7 +1300,7 @@ do_replace(void __user *user, unsigned int len)
return 0;

free_newinfo_untrans:
IPT_ENTRY_ITERATE(loc_cpu_entry, newinfo->size, cleanup_entry,NULL);
IPT_ENTRY_ITERATE(loc_cpu_entry, newinfo->size, cleanup_entry, NULL);
free_newinfo:
xt_free_table_info(newinfo);
return ret;
Expand Down Expand Up @@ -1651,7 +1647,8 @@ static inline int compat_check_entry(struct ipt_entry *e, const char *name,
int j, ret;

j = 0;
ret = IPT_MATCH_ITERATE(e, check_match, name, &e->ip, e->comefrom, &j);
ret = IPT_MATCH_ITERATE(e, check_match, name, &e->ip,
e->comefrom, &j);
if (ret)
goto cleanup_matches;

Expand Down Expand Up @@ -1744,8 +1741,8 @@ translate_compat_table(const char *name,
pos = entry1;
size = total_size;
ret = COMPAT_IPT_ENTRY_ITERATE(entry0, total_size,
compat_copy_entry_from_user, &pos, &size,
name, newinfo, entry1);
compat_copy_entry_from_user,
&pos, &size, name, newinfo, entry1);
xt_compat_flush_offsets(AF_INET);
xt_compat_unlock(AF_INET);
if (ret)
Expand Down Expand Up @@ -1813,7 +1810,7 @@ compat_do_replace(void __user *user, unsigned int len)
if (!newinfo)
return -ENOMEM;

/* choose the copy that is our node/cpu */
/* choose the copy that is on our node/cpu */
loc_cpu_entry = newinfo->entries[raw_smp_processor_id()];
if (copy_from_user(loc_cpu_entry, user + sizeof(tmp),
tmp.size) != 0) {
Expand Down Expand Up @@ -1934,16 +1931,14 @@ compat_get_entries(struct compat_ipt_get_entries __user *uptr, int *len)
if (t && !IS_ERR(t)) {
struct xt_table_info *private = t->private;
struct xt_table_info info;
duprintf("t->private->number = %u\n",
private->number);
duprintf("t->private->number = %u\n", private->number);
ret = compat_table_info(private, &info);
if (!ret && get.size == info.size) {
ret = compat_copy_entries_to_user(private->size,
t, uptr->entrytable);
} else if (!ret) {
duprintf("compat_get_entries: I've got %u not %u!\n",
private->size,
get.size);
private->size, get.size);
ret = -EINVAL;
}
xt_compat_flush_offsets(AF_INET);
Expand Down Expand Up @@ -1981,7 +1976,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
#endif

static int
do_ipt_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)
do_ipt_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)
{
int ret;

Expand Down Expand Up @@ -2068,9 +2063,7 @@ int ipt_register_table(struct xt_table *table, const struct ipt_replace *repl)
if (!newinfo)
return -ENOMEM;

/* choose the copy on our node/cpu
* but dont care of preemption
*/
/* choose the copy on our node/cpu, but dont care about preemption */
loc_cpu_entry = newinfo->entries[raw_smp_processor_id()];
memcpy(loc_cpu_entry, repl->entries, repl->size);

Expand Down Expand Up @@ -2112,7 +2105,8 @@ icmp_type_code_match(u_int8_t test_type, u_int8_t min_code, u_int8_t max_code,
u_int8_t type, u_int8_t code,
bool invert)
{
return ((test_type == 0xFF) || (type == test_type && code >= min_code && code <= max_code))
return ((test_type == 0xFF) ||
(type == test_type && code >= min_code && code <= max_code))
^ invert;
}

Expand Down Expand Up @@ -2153,7 +2147,7 @@ icmp_match(const struct sk_buff *skb,
/* Called when user tries to insert an entry of this type. */
static bool
icmp_checkentry(const char *tablename,
const void *info,
const void *entry,
const struct xt_match *match,
void *matchinfo,
unsigned int hook_mask)
Expand Down Expand Up @@ -2204,9 +2198,9 @@ static struct xt_match icmp_matchstruct __read_mostly = {
.name = "icmp",
.match = icmp_match,
.matchsize = sizeof(struct ipt_icmp),
.checkentry = icmp_checkentry,
.proto = IPPROTO_ICMP,
.family = AF_INET,
.checkentry = icmp_checkentry,
};

static int __init ip_tables_init(void)
Expand Down
Loading

0 comments on commit d84682f

Please sign in to comment.