linux.git/net/bridge/netfilter, branch v2.6.20 Linux kernel source tree [NETFILTER]: ebtables: don't compute gap before checking struct type 2007-01-04T20:17:44+00:00 Chuck Ebbert 76306.1226@compuserve.com 2007-01-04T20:17:44+00:00 44f9a2fdc48ccb8bb510b6e1210bf15b3e10afdb We cannot compute the gap until we know we have a 'struct ebt_entry' and not 'struct ebt_entries'. Failure to check can cause crash. Tested-by: Santiago Garcia Mantinan <manty@manty.net> Acked-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> 
We cannot compute the gap until we know we have a 'struct ebt_entry' and
not 'struct ebt_entries'.  Failure to check can cause crash.

Tested-by: Santiago Garcia Mantinan <manty@manty.net>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
[EBTABLES]: Split ebt_replace into user and kernel variants, annotate. 2006-12-03T05:32:05+00:00 Al Viro viro@zeniv.linux.org.uk 2006-12-01T03:28:48+00:00 1e419cd9953f59d06d7b88d0e2911a68a0044f33 Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
[EBTABLES]: Clean ebt_register_table() up. 2006-12-03T05:32:04+00:00 Al Viro viro@zeniv.linux.org.uk 2006-12-01T03:28:25+00:00 df07a81e939a0176b125bc83cf22dbb5e380ae9f Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
[EBTABLES]: Move calls of ebt_verify_pointers() upstream. 2006-12-03T05:32:03+00:00 Al Viro viro@zeniv.linux.org.uk 2006-12-01T03:28:08+00:00 1bc2326cbe24766d9cb236e63c091cbaecfa2f29 ... and pass just repl->name to translate_table() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> 
... and pass just repl->name to translate_table()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
[EBTABLES]: ebt_check_entry() doesn't need valid_hooks 2006-12-03T05:32:02+00:00 Al Viro viro@zeniv.linux.org.uk 2006-12-01T03:27:48+00:00 f7da79d99863c044e28483e32c10b394bbd78d21 We can check newinfo->hook_entry[...] instead. Kill unused argument. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> 
We can check newinfo->hook_entry[...] instead.
Kill unused argument.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
[EBTABLES]: Clean ebt_get_udc_positions() up. 2006-12-03T05:32:01+00:00 Al Viro viro@zeniv.linux.org.uk 2006-12-01T03:27:32+00:00 177abc348a00738dbc985df8523d755bf87403d9 Check for valid_hooks is redundant (newinfo->hook_entry[i] will be NULL if bit i is not set). Kill it, kill unused arguments. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> 
Check for valid_hooks is redundant (newinfo->hook_entry[i] will
be NULL if bit i is not set).  Kill it, kill unused arguments.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
[EBTABLES]: Switch ebt_check_entry_size_and_hooks() to use of newinfo->hook_entry[] 2006-12-03T05:32:01+00:00 Al Viro viro@zeniv.linux.org.uk 2006-12-01T03:27:13+00:00 0e795531c5e6d0a7d407b8d9edde47cab13be3ec kill unused arguments Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> 
kill unused arguments

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
[EBTABLES]: translate_table(): switch direct uses of repl->hook_info to newinfo 2006-12-03T05:32:00+00:00 Al Viro viro@zeniv.linux.org.uk 2006-12-01T03:26:53+00:00 1f072c96fdf1a0caa11c6e8078dd96925bd02db5 Since newinfo->hook_table[] already has been set up, we can switch to using it instead of repl->{hook_info,valid_hooks}. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> 
Since newinfo->hook_table[] already has been set up, we can switch to using
it instead of repl->{hook_info,valid_hooks}.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
[EBTABLES]: Move more stuff into ebt_verify_pointers(). 2006-12-03T05:31:59+00:00 Al Viro viro@zeniv.linux.org.uk 2006-12-01T03:26:35+00:00 e4fd77deac764e17cb1eab8661bcf1413204d04d Take intialization of ->hook_entry[...], ->entries_size and ->nentries over there, pull the check for empty chains into the end of that sucker. Now it's self-contained, so we can move it up in the very beginning of translate_table() *and* we can rely on ->hook_entry[] being properly transliterated after it. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> 
Take intialization of ->hook_entry[...], ->entries_size and ->nentries
over there, pull the check for empty chains into the end of that sucker.

Now it's self-contained, so we can move it up in the very beginning of
translate_table() *and* we can rely on ->hook_entry[] being properly
transliterated after it.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
[EBTABLES]: Pull the loop doing __ebt_verify_pointers() into a separate function. 2006-12-03T05:31:57+00:00 Al Viro viro@zeniv.linux.org.uk 2006-12-01T03:26:14+00:00 70fe9af47ee01a17fe7486f1739f6eac8a14868b It's easier to expand the iterator here *and* we'll be able to move all uses of ebt_replace from translate_table() into this one. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> 
It's easier to expand the iterator here *and* we'll be able to move all
uses of ebt_replace from translate_table() into this one.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>