|
@@ -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;
|