From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752082Ab1CUPWs (ORCPT <rfc822;w@1wt.eu>);
	Mon, 21 Mar 2011 11:22:48 -0400
Received: from moutng.kundenserver.de ([212.227.17.9]:51910 "EHLO
	moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751146Ab1CUPWq (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 21 Mar 2011 11:22:46 -0400
From: Arnd Bergmann <arnd@arndb.de>
To: Eric Dumazet <eric.dumazet@gmail.com>
Subject: Re: [held lock freed] Re: [GIT] Networking
Date: Mon, 21 Mar 2011 16:22:40 +0100
User-Agent: KMail/1.12.2 (Linux/2.6.37; KDE/4.3.2; x86_64; ; )
Cc: Ingo Molnar <mingo@elte.hu>, David Miller <davem@davemloft.net>,
        torvalds@linux-foundation.org, akpm@linux-foundation.org,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        Peter Zijlstra <a.p.zijlstra@chello.nl>,
        Thomas Gleixner <tglx@linutronix.de>
References: <20110320.195156.226769634.davem@davemloft.net> <201103211550.10694.arnd@arndb.de> <1300719332.2884.370.camel@edumazet-laptop>
In-Reply-To: <1300719332.2884.370.camel@edumazet-laptop>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <201103211622.40851.arnd@arndb.de>
X-Provags-ID: V02:K0:jP6LH9g9aBpEi9SbLlawonh9d6SXrVwSSjHxWMj0FgT
 pcE0YS/kyd1CmbkvUFHKZY+EjjpbRdafPK3U1M7Eeh6E6qiXJH
 1I2s79yU5epzmLszUEPdHNYjBdSM94E9zKm/nOZ0lBxjSp2iCR
 gLRBzIQdIvPGCKUcKC2nKNxzhaCKpLpuwudLNw7jWfM224Kt3u
 oW1GUff3mPAPsVHZlolmw==
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Monday 21 March 2011, Eric Dumazet wrote:
> > diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
> > index 4680b1e..b2cf1db 100644
> > --- a/net/x25/af_x25.c
> > +++ b/net/x25/af_x25.c
> > @@ -669,8 +669,8 @@ static int x25_release(struct socket *sock)
> >  
> >       sock_orphan(sk);
> >  out:
> > -     release_sock(sk);
> >       sock_put(sk);
> > +     release_sock(sk);
> >       return 0;
> >  }
> >  
> 
> Hmm, x25_release() looks fine, I believe no fix is needed.
> 

D'oh. You're right of course. My patch would introduce the bug,
not fix it. Updated patch below.

	Arnd
8<-------------------------
net/appletalk: fix atalk_release use after free

The BKL removal in appletalk introduced a use-after-free problem,
where atalk_destroy_socket frees a sock, but we still release
the socket lock on it.

An easy fix is to take an extra reference on the sock and sock_put
it when returning from atalk_release.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

index 3d4f4b0..206e771 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1051,6 +1051,7 @@ static int atalk_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;
 
+	sock_hold(sk);
 	lock_sock(sk);
 	if (sk) {
 		sock_orphan(sk);
@@ -1058,6 +1059,8 @@ static int atalk_release(struct socket *sock)
 		atalk_destroy_socket(sk);
 	}
 	release_sock(sk);
+	sock_put(sk);
+
 	return 0;
 }