| From | Andi Kleen <> | Subject | [PATCH] [257/275] netfilter: arpt_mangle: fix return values of checkentry | Date | Wed, 30 Mar 2011 14:08:24 -0700 (PDT) |
| |
2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ In 135367b "netfilter: xtables: change xt_target.checkentry return type", the type returned by checkentry was changed from boolean to int, but the return values where not adjusted.
arptables: Input/output error
This broke arptables with the mangle target since it returns true under success, which is interpreted by xtables as >0, thus returning EIO.
The following Linux kernels are affected: * 2.6.35.9 * 2.6.36.4 * 2.6.37.3
Cc: stable@kernel.org Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Andi Kleen <ak@linux.intel.com> (cherry picked from commit 9d0db8b6b1da9e3d4c696ef29449700c58d589db) --- net/ipv4/netfilter/arpt_mangle.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Index: linux-2.6.35.y/net/ipv4/netfilter/arpt_mangle.c =================================================================== --- linux-2.6.35.y.orig/net/ipv4/netfilter/arpt_mangle.c 2011-01-13 09:47:51.000000000 -0800 +++ linux-2.6.35.y/net/ipv4/netfilter/arpt_mangle.c 2011-03-29 23:12:09.451240810 -0700 @@ -60,12 +60,12 @@ if (mangle->flags & ~ARPT_MANGLE_MASK || !(mangle->flags & ARPT_MANGLE_MASK)) - return false; + return -EINVAL; if (mangle->target != NF_DROP && mangle->target != NF_ACCEPT && mangle->target != ARPT_CONTINUE) - return false; - return true; + return -EINVAL; + return 0; } static struct xt_target arpt_mangle_reg __read_mostly = {
|