From patchwork Tue Jan 17 15:27:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Christoph Lameter (Ampere)" X-Patchwork-Id: 136493 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 69B68B6EE8 for ; Wed, 18 Jan 2012 02:27:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754778Ab2AQP1h (ORCPT ); Tue, 17 Jan 2012 10:27:37 -0500 Received: from smtp106.prem.mail.ac4.yahoo.com ([76.13.13.45]:29093 "HELO smtp106.prem.mail.ac4.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754587Ab2AQP1g (ORCPT ); Tue, 17 Jan 2012 10:27:36 -0500 Received: (qmail 47200 invoked from network); 17 Jan 2012 15:27:35 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1326814055; bh=N5tWXeuozfTNTq8MWc1GbgwtjAG1ukCK53Yyf/Bi2IY=; h=X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:Received:Date:From:X-X-Sender:To:cc:Subject:In-Reply-To:Message-ID:References:User-Agent:MIME-Version:Content-Type; b=jAh/eEpA1d1DOJtrVRW/iVw8WaKAb7Fm3DlDnG3NDiFIUOlgMAPWyV0xDhb5A459aFLL7ebfB0sfeDnqami+93/hKTkdoWONvizdUAhJTe8PF+POfvyCXgK9boCcMvhIK/4KpKqUrcvw5e/yOscrnG5L/3P5tkRpOtZqQsyKclc= X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: iOEJ550VM1n0mntCtH5_EknTYUTf47GeUHZFidWP2gS02Rl XJgLuj5hQtg2VhcvVZ8rw73..8rV_bPbrjCL8ok_MAbnXeODnAtKcp9VyZXg cxWUkln7DLUV0BOeTKIUqQnouYTgGOsiBA1paM.4MEVAQgysLCaOKfoAtHa0 xrB8kVwaoD0JWMQAa.IKNiTGfmkVyFXu4NPXKuQWw3N75mcgIbgqna4wNbju C5kkcPvIN1iJztSYM.Pv0LoXeymCUB0LgvKDWhW4riOuCFE9hK4_srsmsf4C jjxzW4pEKKNAvyUYoMjlNLqk00weXo0pHdfaxnHA46zXLbZmxwySv9o.d4qm Qv1a3u6Ow6YvvC_TPRMUGEAPVSa.UpNZeTclXltLrDHE.V1jLFH3bxqn.h1J cYUzfEPf1Yku8jVeKzMwDfV7kF493psP4iiQv X-Yahoo-SMTP: _Dag8S.swBC1p4FJKLCXbs8NQzyse1SYSgnAbY0- Received: from router.home (cl@99.30.10.212 with plain) by smtp106.prem.mail.ac4.yahoo.com with SMTP; 17 Jan 2012 07:27:35 -0800 PST Received: from cl (helo=localhost) by router.home with local-esmtp (Exim 4.71) (envelope-from ) id 1RnAwg-0001PA-MZ; Tue, 17 Jan 2012 09:27:34 -0600 Date: Tue, 17 Jan 2012 09:27:31 -0600 (CST) From: Christoph Lameter X-X-Sender: cl@router.home To: Eric Dumazet cc: Sasha Levin , Dave Jones , davem , Pekka Enberg , Matt Mackall , kaber@trash.net, pablo@netfilter.org, linux-kernel , linux-mm , netfilter-devel@vger.kernel.org, netdev Subject: Re: Hung task when calling clone() due to netfilter/slab In-Reply-To: <1326813630.2259.19.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC> Message-ID: References: <1326558605.19951.7.camel@lappy> <1326561043.5287.24.camel@edumazet-laptop> <1326632384.11711.3.camel@lappy> <1326648305.5287.78.camel@edumazet-laptop> <1326813630.2259.19.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Tue, 17 Jan 2012, Eric Dumazet wrote: > Buggy patch, since "goto err;" is going to up_write(&slub_lock) again. > > Also Christoph, you forgot to add the very much needed : > > Reported-by: Sasha Levin Subject: slub: Do not hold slub_lock when calling sysfs_slab_add() sysfs_slab_add() calls various sysfs functions that actually may end up in userspace doing all sorts of things. Release the slub_lock after adding the kmem_cache structure to the list. At that point the address of the kmem_cache is not known so we are guaranteed exlusive access to the following modifications to the kmem_cache structure. If the sysfs_slab_add fails then reacquire the slub_lock to remove the kmem_cache structure from the list. Reported-by: Sasha Levin Signed-off-by: Christoph Lameter Acked-by: Eric Dumazet --- mm/slub.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 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 Index: linux-2.6/mm/slub.c =================================================================== --- linux-2.6.orig/mm/slub.c 2012-01-17 03:07:11.140010438 -0600 +++ linux-2.6/mm/slub.c 2012-01-17 03:26:06.799986908 -0600 @@ -3929,13 +3929,14 @@ struct kmem_cache *kmem_cache_create(con if (kmem_cache_open(s, n, size, align, flags, ctor)) { list_add(&s->list, &slab_caches); + up_write(&slub_lock); if (sysfs_slab_add(s)) { + down_write(&slub_lock); list_del(&s->list); kfree(n); kfree(s); goto err; } - up_write(&slub_lock); return s; } kfree(n);