From patchwork Sun Jul 6 11:56:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Utkin X-Patchwork-Id: 367383 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 1EB2B1400BE for ; Sun, 6 Jul 2014 21:58:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751307AbaGFL6L (ORCPT ); Sun, 6 Jul 2014 07:58:11 -0400 Received: from mail-la0-f47.google.com ([209.85.215.47]:59381 "EHLO mail-la0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750978AbaGFL6K (ORCPT ); Sun, 6 Jul 2014 07:58:10 -0400 Received: by mail-la0-f47.google.com with SMTP id s18so2093246lam.6 for ; Sun, 06 Jul 2014 04:58:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HI9+MZDQVWtsyXwsnLb2CeMSliIIjthmqLcqFic4STY=; b=iuZ2zXeZPJGLXnUYAsU981O6WvDGvwcjsF1zluBI9E2KqZB3k5VV6px6/B2jQgy33g oyWyzVK5g70PpT+LdduEN6Ej1fQ08LJG6E2WZT05SM7YAs+foFSusKhrnogfdJl3YJoB gw32sUP8uU/hG1kEwDPrr9s3hVFBeZZsIiNMwfUwZFlzfBEPOClD/eXfuAVQlqzh0k6R kTufcpDbzI+9um0BxlLZMtMFG7W1RL+1nP4bdJujChBnuE0hE9tu72F3Tm5hIU8x61ku CUdRXkkwSwh65P36oqDW7hWqh1BzscZAkzPBrARKgen3J/EkrNJIZ1HEmEKx9Xo0alUi wZOA== X-Received: by 10.152.9.234 with SMTP id d10mr1599792lab.56.1404647887672; Sun, 06 Jul 2014 04:58:07 -0700 (PDT) Received: from localhost.localdomain (alfa-g11.tenet.odessa.ua. [195.138.73.151]) by mx.google.com with ESMTPSA id e8sm36646449lbo.10.2014.07.06.04.58.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Jul 2014 04:58:06 -0700 (PDT) From: Andrey Utkin To: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, acme@ghostprotocols.net, netdev@vger.kernel.org Cc: davem@davemloft.net, Andrey Utkin Subject: [PATCH] appletalk: Set skb with destructor Date: Sun, 6 Jul 2014 14:56:56 +0300 Message-Id: <1404647816-7564-1-git-send-email-andrey.krieger.utkin@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <20140705202821.GA25880@mwanda> References: <20140705202821.GA25880@mwanda> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The sock ref counting is off so there is a kernel panic when you run `atalkd`. See https://bugzilla.kernel.org/show_bug.cgi?id=79441 This fix is similar to 0ae89beb283a ('can: add destructor for self generated skbs') Reported-by: Ed Martin Signed-off-by: Andrey Utkin --- net/appletalk/ddp.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 01a1082..3d8ab34 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c @@ -1399,6 +1399,11 @@ drop: return NET_RX_DROP; } +static inline void atalk_skb_destructor(struct sk_buff *skb) +{ + sock_put(skb->sk); +} + /** * atalk_rcv - Receive a packet (in skb) from device dev * @skb - packet received @@ -1489,6 +1494,8 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev, goto drop; /* Queue packet (standard) */ + sock_hold(sock); + skb->destructor = atalk_skb_destructor; skb->sk = sock; if (sock_queue_rcv_skb(sock, skb) < 0) @@ -1644,6 +1651,8 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr if (!skb) goto out; + sock_hold(sk); + skb->destructor = atalk_skb_destructor; skb->sk = sk; skb_reserve(skb, ddp_dl->header_length); skb_reserve(skb, dev->hard_header_len);