git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[pandora-kernel.git]
/
net
/
bridge
/
netfilter
/
ebtables.c
diff --git
a/net/bridge/netfilter/ebtables.c
b/net/bridge/netfilter/ebtables.c
index
bee558a
..
6c84ccb
100644
(file)
--- a/
net/bridge/netfilter/ebtables.c
+++ b/
net/bridge/netfilter/ebtables.c
@@
-610,7
+610,7
@@
ebt_check_entry(struct ebt_entry *e, struct ebt_table_info *newinfo,
struct ebt_entry_target *t;
struct ebt_target *target;
unsigned int i, j, hook = 0, hookmask = 0;
struct ebt_entry_target *t;
struct ebt_target *target;
unsigned int i, j, hook = 0, hookmask = 0;
- size_t gap
= e->next_offset - e->target_offset
;
+ size_t gap;
int ret;
/* don't mess with the struct ebt_entries */
int ret;
/* don't mess with the struct ebt_entries */
@@
-660,6
+660,7
@@
ebt_check_entry(struct ebt_entry *e, struct ebt_table_info *newinfo,
if (ret != 0)
goto cleanup_watchers;
t = (struct ebt_entry_target *)(((char *)e) + e->target_offset);
if (ret != 0)
goto cleanup_watchers;
t = (struct ebt_entry_target *)(((char *)e) + e->target_offset);
+ gap = e->next_offset - e->target_offset;
target = find_target_lock(t->u.name, &ret, &ebt_mutex);
if (!target)
goto cleanup_watchers;
target = find_target_lock(t->u.name, &ret, &ebt_mutex);
if (!target)
goto cleanup_watchers;