From fa7f70f8042c5fd8b64821cbfd66fdea5c1a2a67 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Wed, 26 Jan 2011 22:26:01 +0100 Subject: Correct the error codes: use ENOENT and EMSGSIZE Use correct error codes (Patrick McHardy's review) --- kernel/include/linux/netfilter/ipset/ip_set_ahash.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'kernel/include/linux') diff --git a/kernel/include/linux/netfilter/ipset/ip_set_ahash.h b/kernel/include/linux/netfilter/ipset/ip_set_ahash.h index 8d4f259..ac98c2a 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_ahash.h +++ b/kernel/include/linux/netfilter/ipset/ip_set_ahash.h @@ -525,7 +525,7 @@ type_pf_head(struct ip_set *set, struct sk_buff *skb) return 0; nla_put_failure: - return -EFAULT; + return -EMSGSIZE; } /* Reply a LIST/SAVE request: dump the elements of the specified set */ @@ -545,7 +545,7 @@ type_pf_list(const struct ip_set *set, atd = ipset_nest_start(skb, IPSET_ATTR_ADT); if (!atd) - return -EFAULT; + return -EMSGSIZE; pr_debug("list hash set %s\n", set->name); for (; cb->args[2] < jhash_size(t->htable_bits); cb->args[2]++) { incomplete = skb_tail_pointer(skb); @@ -559,7 +559,7 @@ type_pf_list(const struct ip_set *set, if (!nested) { if (cb->args[2] == first) { nla_nest_cancel(skb, atd); - return -EFAULT; + return -EMSGSIZE; } else goto nla_put_failure; } @@ -581,6 +581,7 @@ nla_put_failure: pr_warning("Can't list set %s: one bucket does not fit into " "a message. Please report it!\n", set->name); cb->args[2] = 0; + return -EMSGSIZE; } return 0; } @@ -946,7 +947,7 @@ type_pf_tlist(const struct ip_set *set, atd = ipset_nest_start(skb, IPSET_ATTR_ADT); if (!atd) - return -EFAULT; + return -EMSGSIZE; for (; cb->args[2] < jhash_size(t->htable_bits); cb->args[2]++) { incomplete = skb_tail_pointer(skb); n = hbucket(t, cb->args[2]); @@ -960,7 +961,7 @@ type_pf_tlist(const struct ip_set *set, if (!nested) { if (cb->args[2] == first) { nla_nest_cancel(skb, atd); - return -EFAULT; + return -EMSGSIZE; } else goto nla_put_failure; } @@ -982,6 +983,7 @@ nla_put_failure: pr_warning("Can't list set %s: one bucket does not fit into " "a message. Please report it!\n", set->name); cb->args[2] = 0; + return -EMSGSIZE; } return 0; } -- cgit v1.2.3