[2/3] netfilter: nfnetlink_log: improve error handling on __build_packet_message()

1) If there's no enough room in the netlink skbuff, then we have a size
   miscalculation bug that needs to be fixed, so warn on this. Kill
   PRINTR macro now that this is unused.

2) Cancel the netlink message that didn't fit into the skbuff, so we still
   have the chance to deliver what is already included in the batch.

3) Don't increment inst->qlen inconditionally. Otherwise, this will not
   show the real number of messages in the log batch on error.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/netfilter/nfnetlink_log.c |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

On 06-11-2014 09:32, Pablo Neira Ayuso wrote:
> 1) If there's no enough room in the netlink skbuff, then we have a size
>     miscalculation bug that needs to be fixed, so warn on this. Kill
>     PRINTR macro now that this is unused.
>
> 2) Cancel the netlink message that didn't fit into the skbuff, so we still
>     have the chance to deliver what is already included in the batch.
>
> 3) Don't increment inst->qlen inconditionally. Otherwise, this will not
>     show the real number of messages in the log batch on error.
>
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> ---
>   net/netfilter/nfnetlink_log.c |   14 ++++++--------
>   1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
> index cd99294..551142f 100644
> --- a/net/netfilter/nfnetlink_log.c
> +++ b/net/netfilter/nfnetlink_log.c
> @@ -46,9 +46,6 @@
>   /* max packet size is limited by 16-bit struct nfattr nfa_len field */
>   #define NFULNL_COPY_RANGE_MAX	(0xFFFF - NLA_HDRLEN)
>
> -#define PRINTR(x, args...)	do { if (net_ratelimit()) \
> -				     printk(x, ## args); } while (0);
> -
>   struct nfulnl_instance {
>   	struct hlist_node hlist;	/* global list of instances */
>   	spinlock_t lock;
> @@ -402,7 +399,6 @@ __build_packet_message(struct nfnl_log_net *log,
>   	struct nfulnl_msg_packet_hdr pmsg;
>   	struct nlmsghdr *nlh;
>   	struct nfgenmsg *nfmsg;
> -	sk_buff_data_t old_tail = inst->skb->tail;
>   	struct sock *sk;
>   	const unsigned char *hwhdrp;
>
> @@ -578,11 +574,15 @@ __build_packet_message(struct nfnl_log_net *log,
>   			BUG();
>   	}
>
> -	nlh->nlmsg_len = inst->skb->tail - old_tail;
> +	nlmsg_end(inst->skb, nlh);
> +	inst->qlen++;
> +
>   	return 0;
>
>   nla_put_failure:
> -	PRINTR(KERN_ERR "nfnetlink_log: error creating log nlmsg\n");
> +	WARN_ONCE(1, "bad nlskb size: %u, tailroom %d\n",
> +		  inst->skb->len, skb_tailroom(inst->skb));
> +	nlmsg_cancel(inst->skb, nlh);
>   	return -1;
>   }
>
> @@ -702,8 +702,6 @@ nfulnl_log_packet(struct net *net,
>   			goto alloc_failure;
>   	}
>
> -	inst->qlen++;
> -
>   	__build_packet_message(log, inst, skb, data_len, pf,
>   				hooknum, in, out, prefix, plen);

I would prefer if we freed the skbuff if __build_package_message failed, so 
that the next one is allocated with other params.

Also, if it's the first message, we may fire the timer for delivering an empty 
message, as the timer is going to be scheduled and inst->skb is still there.

Maybe with:

  @@ -707,16 +707,19 @@ nfulnl_log_packet(struct net *net,
                         goto alloc_failure;
         }

-       inst->qlen++;
-
-       __build_packet_message(log, inst, skb, data_len, pf,
-                               hooknum, in, out, prefix, plen);
+       if (__build_packet_message(log, inst, skb, data_len, pf,
+                                  hooknum, in, out, prefix, plen)) {
+               if (!inst->qlen) {
+                       kfree_skb(inst->skb);
+                       inst->skb = NULL;
+               }
+       }

         if (inst->qlen >= qthreshold)
                 __nfulnl_flush(inst);
         /* timer_pending always called within inst->lock, so there
          * is no chance of a race here */
-       else if (!timer_pending(&inst->timer)) {
+       else if (inst->qlen && !timer_pending(&inst->timer)) {
                 instance_get(inst);
                 inst->timer.expires = jiffies + (inst->flushtimeout*HZ/100);
                 add_timer(&inst->timer);

but that still wouldn't force a flush if __build_packet_message() failed..

Other than that, set looks great to me. Thanks Pablo!

Marcelo


--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html