Skip to content

Commit

Permalink
netfilter: nfnetlink_log: remove unnecessary error messages
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pablo Neira Ayuso committed Nov 13, 2014
1 parent 5676864 commit 8225161
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions net/netfilter/nfnetlink_log.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 8225161

Please sign in to comment.