diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-11-06 12:32:28 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-11-13 13:13:00 +0100 |
| commit | 8225161545a67bdb68cf86beafcdce1604720605 (patch) | |
| tree | 5d305b30e58d2327a55234f449dce4538e53a48b | |
| parent | 56768644317c7746cb63f61573fcdc2355885707 (diff) | |
| download | linux-8225161545a67bdb68cf86beafcdce1604720605.tar.gz linux-8225161545a67bdb68cf86beafcdce1604720605.tar.bz2 linux-8225161545a67bdb68cf86beafcdce1604720605.zip | |
netfilter: nfnetlink_log: remove unnecessary error messages
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>
| -rw-r--r-- | net/netfilter/nfnetlink_log.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c index b1e3a0579416..51996ece3d2a 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; |