From patchwork Mon Jul 7 20:22:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Utkin X-Patchwork-Id: 367717 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 A93791400BE for ; Tue, 8 Jul 2014 06:23:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751834AbaGGUXL (ORCPT ); Mon, 7 Jul 2014 16:23:11 -0400 Received: from mail-lb0-f175.google.com ([209.85.217.175]:38113 "EHLO mail-lb0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750868AbaGGUXK (ORCPT ); Mon, 7 Jul 2014 16:23:10 -0400 Received: by mail-lb0-f175.google.com with SMTP id n15so3298199lbi.34 for ; Mon, 07 Jul 2014 13:23:08 -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; bh=m22rthS7uucqC2+slFSByOUjuSdnG1rb3wDDzFBK9kw=; b=ralGx3PCF8IUjYZiTMrkemcFiriYx4Ix+ilEPutZXaKQlRdPU5k1cSAYC+MTlFLWMU FoUMOyevrNeJj+5tBLAtimN8q5U63x0/zsb0o1lX/x/mFxYYm++6zpUTCRdtBTc39Lrq bsII5bV/8FboXbY9h/poNV15Q1yKuhHqUn1vqT+O0caTt0BJID15z2QLu1UOQ2rAh20P X8bvhyxEdKcnUgLpdmCHx47mGOwefZwiUtwwsSFSTZMR7OO3sv41bwHsk4BLw6Zm56d1 5HwdGZecrcq1Ax/7vP1k0YpPlLUTswIhOrwTmMTlu053EsnLAm43HLvGkegvPJDffleI OXlA== X-Received: by 10.112.198.161 with SMTP id jd1mr7946573lbc.56.1404764587996; Mon, 07 Jul 2014 13:23:07 -0700 (PDT) Received: from localhost.localdomain (alfa-g11.tenet.odessa.ua. [195.138.73.151]) by mx.google.com with ESMTPSA id c3sm19571039laa.33.2014.07.07.13.23.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Jul 2014 13:23:06 -0700 (PDT) From: Andrey Utkin To: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, netdev@vger.kernel.org Cc: acme@ghostprotocols.net, davem@davemloft.net, eric.dumazet@gmail.com, Andrey Utkin Subject: [PATCH] appletalk: Fix socket referencing in skb Date: Mon, 7 Jul 2014 23:22:50 +0300 Message-Id: <1404764570-24120-1-git-send-email-andrey.krieger.utkin@gmail.com> X-Mailer: git-send-email 1.8.3.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Setting just skb->sk without taking its reference and setting a destructor is invalid. However, in the places where this was done, skb is used in a way not requiring skb->sk setting. So dropping the setting of skb->sk. Thanks to Eric Dumazet for correct solution. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=79441 Reported-by: Ed Martin Signed-off-by: Andrey Utkin Signed-off-by: Eric Dumazet --- net/appletalk/ddp.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 01a1082..bfcf6be 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c @@ -1489,8 +1489,6 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev, goto drop; /* Queue packet (standard) */ - skb->sk = sock; - if (sock_queue_rcv_skb(sock, skb) < 0) goto drop; @@ -1644,7 +1642,6 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr if (!skb) goto out; - skb->sk = sk; skb_reserve(skb, ddp_dl->header_length); skb_reserve(skb, dev->hard_header_len); skb->dev = dev;