From patchwork Mon Apr 23 07:30:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 154345 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 80A9FB70C1 for ; Mon, 23 Apr 2012 17:30:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753967Ab2DWHae (ORCPT ); Mon, 23 Apr 2012 03:30:34 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:47959 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753758Ab2DWHad (ORCPT ); Mon, 23 Apr 2012 03:30:33 -0400 Received: by mail-bk0-f46.google.com with SMTP id ik5so8325026bkc.19 for ; Mon, 23 Apr 2012 00:30:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=NhFv7sqeSuYuXNhdI1j1QWUqpLFLnx0wiyd4Y5Z9s/s=; b=r44T1eDvVEwGf+WIwpIXrQRj3IPj2LlB/Ok8nxRN+CVP9ce8r1xpvdPvtaTPxsiVKr 6Zgup6AdUZFUsm+Tk1HtxyA7uRZFxUGUVhD71Zr4PAbC9fQZtKXBAfjrM9IyiWtoUsSK jVFtS14p8C0p7x8bFISHA33VZ51m7YxoagtHPmR9xjAB9f4OohAleKUfDtwjJfWysk1h OkRBI6f5fonB66RACDZf3rh30A5Gq6cfF1s7hhFbCuHc78nTnxbOekAkpRHVVtKsiBO0 3g33MqEYgMJnvLFwK259h6QnKIzaO50KJLsThuKOi47WQBlxl99m6SXv/P6cns5OuHzs h8rg== Received: by 10.204.151.212 with SMTP id d20mr2926256bkw.61.1335166232499; Mon, 23 Apr 2012 00:30:32 -0700 (PDT) Received: from [172.28.89.177] ([74.125.122.49]) by mx.google.com with ESMTPS id v2sm12362600bkw.16.2012.04.23.00.30.30 (version=SSLv3 cipher=OTHER); Mon, 23 Apr 2012 00:30:31 -0700 (PDT) Subject: [PATCH 2/2 net-next] af_netlink: drop_monitor/dropwatch friendly From: Eric Dumazet To: David Miller Cc: netdev Date: Mon, 23 Apr 2012 09:30:29 +0200 Message-ID: <1335166229.3293.14.camel@edumazet-glaptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric Dumazet Need to consume_skb() instead of kfree_skb() in netlink_dump() and netlink_unicast_kernel() to avoid false dropwatch positives. Signed-off-by: Eric Dumazet --- net/netlink/af_netlink.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 85d27f9..b3025a6 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -154,6 +154,12 @@ static void netlink_destroy_callback(struct netlink_callback *cb) kfree(cb); } +static void netlink_consume_callback(struct netlink_callback *cb) +{ + consume_skb(cb->skb); + kfree(cb); +} + static void netlink_sock_destruct(struct sock *sk) { struct netlink_sock *nlk = nlk_sk(sk); @@ -902,8 +908,10 @@ static int netlink_unicast_kernel(struct sock *sk, struct sk_buff *skb) ret = skb->len; skb_set_owner_r(skb, sk); nlk->netlink_rcv(skb); + consume_skb(skb); + } else { + kfree_skb(skb); } - kfree_skb(skb); sock_put(sk); return ret; } @@ -1728,7 +1736,7 @@ static int netlink_dump(struct sock *sk) nlk->cb = NULL; mutex_unlock(nlk->cb_mutex); - netlink_destroy_callback(cb); + netlink_consume_callback(cb); return 0; errout_skb: