From patchwork Mon Aug 20 06:18:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick McHardy X-Patchwork-Id: 178667 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8F19E2C0085 for ; Mon, 20 Aug 2012 16:19:09 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752656Ab2HTGTB (ORCPT ); Mon, 20 Aug 2012 02:19:01 -0400 Received: from stinky.trash.net ([213.144.137.162]:36019 "EHLO stinky.trash.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752150Ab2HTGS5 (ORCPT ); Mon, 20 Aug 2012 02:18:57 -0400 Received: from zenbook.localnet (localhost [127.0.0.1]) by stinky.trash.net (Postfix) with ESMTP id CEDACB2C4A; Mon, 20 Aug 2012 08:18:55 +0200 (MEST) From: Patrick McHardy To: Florian.Westphal@Sophos.com Cc: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org Subject: [PATCH 03/11] netlink: don't orphan skb in netlink_trim() Date: Mon, 20 Aug 2012 08:18:44 +0200 Message-Id: <1345443532-3707-4-git-send-email-kaber@trash.net> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1345443532-3707-1-git-send-email-kaber@trash.net> References: <1345443532-3707-1-git-send-email-kaber@trash.net> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Netlink doesn't account skbs to the sending socket, so the there's no need to orphan the skb before trimming it. Removing the skb_orphan() call is required for mmap'ed netlink, which uses a netlink specific skb destructor that must not be invoked before the final freeing of the skb. Signed-off-by: Patrick McHardy --- net/netlink/af_netlink.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 1bdfa52..3233601 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -886,7 +886,7 @@ static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation) { int delta; - skb_orphan(skb); + WARN_ON(skb->sk != NULL); delta = skb->end - skb->tail; if (delta * 2 < skb->truesize)