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 S1752145AbdLFPwo (ORCPT <rfc822;w@1wt.eu>);
        Wed, 6 Dec 2017 10:52:44 -0500
Received: from mail-pg0-f68.google.com ([74.125.83.68]:37168 "EHLO
        mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751610AbdLFPwl (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 6 Dec 2017 10:52:41 -0500
X-Google-Smtp-Source: AGs4zMaCYlYKfSTtpqZsDB8XkgA1ixp/0YBE1T91vyVRo0JcNu6YhEktiah/a7ERkSAr/x8agNHtFQ==
Date: Thu, 7 Dec 2017 00:49:57 +0900
From: Namhyung Kim <namhyung@kernel.org>
To: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
        Fengguang Wu <fengguang.wu@intel.com>, linux-kernel@vger.kernel.org,
        Wang Nan <wangnan0@huawei.com>, Ingo Molnar <mingo@redhat.com>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Jiri Olsa <jolsa@redhat.com>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Will Deacon <will.deacon@arm.com>, lkp@01.org,
        Dmitry Vyukov <dvyukov@google.com>, kasan-dev@googlegroups.com,
        kernel-team@lge.com
Subject: Re: BUG: KASAN: slab-out-of-bounds in perf_callchain_user+0x494/0x530
Message-ID: <20171206154957.GB3367@danjae.aot.lge.com>
References: <20171130023218.g2y35nn4zyufqk6t@wfg-t540p.sh.intel.com>
 <20171130082026.ih7esfpn4wfsfoge@hirez.programming.kicks-ass.net>
 <20171130193712.GU3298@kernel.org>
 <20171205081156.GB16663@sejong>
 <20171205133740.GA28405@kernel.org>
 <20171205144718.GA27916@danjae.aot.lge.com>
 <20171206134706.ahlr6ygnhtu2ik4s@hirez.programming.kicks-ass.net>
 <20171206143130.GA3367@danjae.aot.lge.com>
 <20171206154544.oiavdgfrpryak23z@hirez.programming.kicks-ass.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20171206154544.oiavdgfrpryak23z@hirez.programming.kicks-ass.net>
User-Agent: Mutt/1.9.1 (2017-09-22)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, Dec 06, 2017 at 04:45:44PM +0100, Peter Zijlstra wrote:
> On Wed, Dec 06, 2017 at 11:31:30PM +0900, Namhyung Kim wrote:
> 
> > > There's also a race against put_callchain_buffers() there, consider:
> > > 
> > > 
> > > 	get_callchain_buffers()		put_callchain_buffers()
> > > 	  mutex_lock();
> > > 	  inc()
> > > 					  dec_and_test() // false
> > > 
> > > 	  dec() // 0
> > > 
> > > 
> > > And the buffers leak.
> > 
> > Hmm.. did you mean that get_callchain_buffers() returns an error?
> 
> Yes, get_callchain_buffers() fails, but while doing so it has a
> temporary increment on the count.
> 
> > AFAICS it cannot fail when it sees count > 1 (and callchain_cpus_
> > entries is allocated).  
> 
> It can with your patch. We only test event_max_stack against the sysctl
> after incrementing.

So, are you ok with this?

Thanks,
Namhyung


diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c
index 1b2be63c8528..ee0ba22d3993 100644
--- a/kernel/events/callchain.c
+++ b/kernel/events/callchain.c
@@ -137,8 +137,11 @@ int get_callchain_buffers(int event_max_stack)
 
        err = alloc_callchain_buffers();
 exit:
-       if (err)
-               atomic_dec(&nr_callchain_events);
+       if (err) {
+               /* might race with put_callchain_buffers() */
+               if (atomic_dec_and_test(&nr_callchain_events))
+                       release_callchain_buffers();
+       }
 
        mutex_unlock(&callchain_mutex);