From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 6/6] netfilter: nft_counter: fix erroneous return values
Date: Tue, 16 Feb 2016 18:02:37 +0100 [thread overview]
Message-ID: <1455642157-6864-7-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1455642157-6864-1-git-send-email-pablo@netfilter.org>
From: Anton Protopopov <a.s.protopopov@gmail.com>
The nft_counter_init() and nft_counter_clone() functions should return
negative error value -ENOMEM instead of positive ENOMEM.
Signed-off-by: Anton Protopopov <a.s.protopopov@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nft_counter.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/nft_counter.c b/net/netfilter/nft_counter.c
index c7808fc..c9743f7 100644
--- a/net/netfilter/nft_counter.c
+++ b/net/netfilter/nft_counter.c
@@ -100,7 +100,7 @@ static int nft_counter_init(const struct nft_ctx *ctx,
cpu_stats = netdev_alloc_pcpu_stats(struct nft_counter_percpu);
if (cpu_stats == NULL)
- return ENOMEM;
+ return -ENOMEM;
preempt_disable();
this_cpu = this_cpu_ptr(cpu_stats);
@@ -138,7 +138,7 @@ static int nft_counter_clone(struct nft_expr *dst, const struct nft_expr *src)
cpu_stats = __netdev_alloc_pcpu_stats(struct nft_counter_percpu,
GFP_ATOMIC);
if (cpu_stats == NULL)
- return ENOMEM;
+ return -ENOMEM;
preempt_disable();
this_cpu = this_cpu_ptr(cpu_stats);
--
2.1.4
next prev parent reply other threads:[~2016-02-16 17:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 17:02 [PATCH 0/6] Netfilter fixes for net Pablo Neira Ayuso
2016-02-16 17:02 ` [PATCH 1/6] netfilter: conntrack: resched in nf_ct_iterate_cleanup Pablo Neira Ayuso
2016-02-16 17:02 ` [PATCH 2/6] netfilter: nfnetlink: use original skbuff when acking batches Pablo Neira Ayuso
2016-02-16 17:02 ` [PATCH 3/6] netfilter: cttimeout: fix deadlock due to erroneous unlock/lock conversion Pablo Neira Ayuso
2016-02-16 17:02 ` [PATCH 4/6] netfilter: nfnetlink: correctly validate length of batch messages Pablo Neira Ayuso
2016-02-16 17:02 ` [PATCH 5/6] netfilter: tee: select NF_DUP_IPV6 unconditionally Pablo Neira Ayuso
2016-02-16 17:02 ` Pablo Neira Ayuso [this message]
2016-02-16 17:56 ` [PATCH 0/6] Netfilter fixes for net David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455642157-6864-7-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).