From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 13/17] netfilter: nfnetlink_log: remove unnecessary error messages
Date: Mon, 24 Nov 2014 14:27:50 +0100 [thread overview]
Message-ID: <1416835674-11871-14-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1416835674-11871-1-git-send-email-pablo@netfilter.org>
In case of OOM, there's nothing userspace can do.
If there's no room to put the payload in __build_packet_message(),
jump to nla_put_failure which already performs the corresponding
error reporting.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nfnetlink_log.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index b1e3a05..51996ec 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -334,9 +334,6 @@ nfulnl_alloc_skb(struct net *net, u32 peer_portid, unsigned int inst_size,
skb = nfnetlink_alloc_skb(net, pkt_size,
peer_portid, GFP_ATOMIC);
- if (!skb)
- pr_err("nfnetlink_log: can't even alloc %u bytes\n",
- pkt_size);
}
}
@@ -568,10 +565,8 @@ __build_packet_message(struct nfnl_log_net *log,
struct nlattr *nla;
int size = nla_attr_size(data_len);
- if (skb_tailroom(inst->skb) < nla_total_size(data_len)) {
- printk(KERN_WARNING "nfnetlink_log: no tailroom!\n");
- return -1;
- }
+ if (skb_tailroom(inst->skb) < nla_total_size(data_len))
+ goto nla_put_failure;
nla = (struct nlattr *)skb_put(inst->skb, nla_total_size(data_len));
nla->nla_type = NFULA_PAYLOAD;
--
1.7.10.4
next prev parent reply other threads:[~2014-11-24 13:27 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-24 13:27 [PATCH 00/17] netfilter/ipvs updates for net-next Pablo Neira Ayuso
2014-11-24 13:27 ` [PATCH 01/17] netfilter: refactor NAT redirect IPv4 to use it from nf_tables Pablo Neira Ayuso
2014-11-24 13:27 ` [PATCH 02/17] netfilter: refactor NAT redirect IPv6 code " Pablo Neira Ayuso
2014-11-24 13:27 ` [PATCH 03/17] netfilter: nf_tables: add new expression nft_redir Pablo Neira Ayuso
2014-11-24 13:27 ` [PATCH 04/17] ipvs: remove unnecessary assignment in __ip_vs_get_out_rt Pablo Neira Ayuso
2014-11-24 13:27 ` [PATCH 05/17] netfilter: nf_log: Introduce nft_log_dereference() macro Pablo Neira Ayuso
2014-11-24 13:27 ` [PATCH 06/17] netfilter: log: protect nf_log_register against double registering Pablo Neira Ayuso
2014-11-24 13:27 ` [PATCH 07/17] netfilter: fix spelling errors Pablo Neira Ayuso
2014-11-24 13:27 ` [PATCH 08/17] netfilter: nf_log: fix sparse warning in nf_logger_find_get() Pablo Neira Ayuso
2014-11-24 13:27 ` [PATCH 09/17] netfilter: nft_meta: add cgroup support Pablo Neira Ayuso
2014-11-24 13:27 ` [PATCH 10/17] netfilter: fix unmet dependencies in NETFILTER_XT_TARGET_REDIRECT Pablo Neira Ayuso
2014-11-24 13:27 ` [PATCH 11/17] netfilter: nft_redir: fix sparse warnings Pablo Neira Ayuso
2014-11-24 13:27 ` [PATCH 12/17] netfilter: fix various " Pablo Neira Ayuso
2014-11-24 13:27 ` Pablo Neira Ayuso [this message]
2014-11-24 13:27 ` [PATCH 14/17] netfilter: xt_connlimit: honor conntrack zone if available Pablo Neira Ayuso
2014-11-24 13:27 ` [PATCH 15/17] netfilter: nf_conntrack_h323: lookup route from proper net namespace Pablo Neira Ayuso
2014-11-24 13:27 ` [PATCH 16/17] netfilter: Deletion of unnecessary checks before two function calls Pablo Neira Ayuso
2014-11-24 13:27 ` [PATCH 17/17] netfilter: nfnetlink_log: Make use of pr_fmt where applicable Pablo Neira Ayuso
2014-11-24 21:01 ` [PATCH 00/17] netfilter/ipvs updates for net-next 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=1416835674-11871-14-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).