diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2010-03-25 11:34:45 -0400 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2010-03-25 11:55:49 -0400 |
commit | d6b00a5345ce4e86e8b00a88bb84a2c0c1f69ddc (patch) | |
tree | 11d68bb08584fbbae02a7bf22599bdd67da4408e /net/ipv6 | |
parent | bd414ee605ff3ac5fcd79f57269a897879ee4cde (diff) |
netfilter: xtables: change targets to return error code
Part of the transition of done by this semantic patch:
// <smpl>
@ rule1 @
struct xt_target ops;
identifier check;
@@
ops.checkentry = check;
@@
identifier rule1.check;
@@
check(...) { <...
-return true;
+return 0;
...> }
@@
identifier rule1.check;
@@
check(...) { <...
-return false;
+return -EINVAL;
...> }
// </smpl>
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/netfilter/ip6t_LOG.c | 6 | ||||
-rw-r--r-- | net/ipv6/netfilter/ip6t_REJECT.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv6/netfilter/ip6t_LOG.c b/net/ipv6/netfilter/ip6t_LOG.c index bcc3fc19374a..439ededd5300 100644 --- a/net/ipv6/netfilter/ip6t_LOG.c +++ b/net/ipv6/netfilter/ip6t_LOG.c | |||
@@ -457,13 +457,13 @@ static int log_tg6_check(const struct xt_tgchk_param *par) | |||
457 | 457 | ||
458 | if (loginfo->level >= 8) { | 458 | if (loginfo->level >= 8) { |
459 | pr_debug("level %u >= 8\n", loginfo->level); | 459 | pr_debug("level %u >= 8\n", loginfo->level); |
460 | return false; | 460 | return -EINVAL; |
461 | } | 461 | } |
462 | if (loginfo->prefix[sizeof(loginfo->prefix)-1] != '\0') { | 462 | if (loginfo->prefix[sizeof(loginfo->prefix)-1] != '\0') { |
463 | pr_debug("prefix not null-terminated\n"); | 463 | pr_debug("prefix not null-terminated\n"); |
464 | return false; | 464 | return -EINVAL; |
465 | } | 465 | } |
466 | return true; | 466 | return 0; |
467 | } | 467 | } |
468 | 468 | ||
469 | static struct xt_target log_tg6_reg __read_mostly = { | 469 | static struct xt_target log_tg6_reg __read_mostly = { |
diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c index 8d5141ece671..55b9b2da1340 100644 --- a/net/ipv6/netfilter/ip6t_REJECT.c +++ b/net/ipv6/netfilter/ip6t_REJECT.c | |||
@@ -220,16 +220,16 @@ static int reject_tg6_check(const struct xt_tgchk_param *par) | |||
220 | 220 | ||
221 | if (rejinfo->with == IP6T_ICMP6_ECHOREPLY) { | 221 | if (rejinfo->with == IP6T_ICMP6_ECHOREPLY) { |
222 | pr_info("ECHOREPLY is not supported.\n"); | 222 | pr_info("ECHOREPLY is not supported.\n"); |
223 | return false; | 223 | return -EINVAL; |
224 | } else if (rejinfo->with == IP6T_TCP_RESET) { | 224 | } else if (rejinfo->with == IP6T_TCP_RESET) { |
225 | /* Must specify that it's a TCP packet */ | 225 | /* Must specify that it's a TCP packet */ |
226 | if (e->ipv6.proto != IPPROTO_TCP || | 226 | if (e->ipv6.proto != IPPROTO_TCP || |
227 | (e->ipv6.invflags & XT_INV_PROTO)) { | 227 | (e->ipv6.invflags & XT_INV_PROTO)) { |
228 | pr_info("TCP_RESET illegal for non-tcp\n"); | 228 | pr_info("TCP_RESET illegal for non-tcp\n"); |
229 | return false; | 229 | return -EINVAL; |
230 | } | 230 | } |
231 | } | 231 | } |
232 | return true; | 232 | return 0; |
233 | } | 233 | } |
234 | 234 | ||
235 | static struct xt_target reject_tg6_reg __read_mostly = { | 235 | static struct xt_target reject_tg6_reg __read_mostly = { |