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 S1755216AbbGZKzB (ORCPT <rfc822;w@1wt.eu>);
	Sun, 26 Jul 2015 06:55:01 -0400
Received: from static.148.38.9.176.clients.your-server.de ([176.9.38.148]:47045
	"EHLO manjaro.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753887AbbGZKy7 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Sun, 26 Jul 2015 06:54:59 -0400
Subject: Re: [linux41] regression with 'x86/cacheinfo: Move cacheinfo sysfs
 code to generic infrastructure' on AMD i686
To: Borislav Petkov <bp@alien8.de>, Thomas Gleixner <tglx@linutronix.de>
References: <55B16967.1040609@manjaro.org> <55B47BB8.6080202@manjaro.org>
 <alpine.DEB.2.11.1507261012480.18576@nanos>
 <20150726084154.GA14829@nazgul.tnic>
Cc: linux-kernel@vger.kernel.org, Sudeep Holla <sudeep.holla@arm.com>,
        Guenter Roeck <linux@roeck-us.net>, manjaro-dev@manjaro.org,
        Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
        Andre Przywara <andre.przywara@arm.com>, Borislav Petkov <bp@suse.de>
From: =?UTF-8?Q?Philip_M=c3=bcller?= <philm@manjaro.org>
Message-ID: <55B4BC7F.1060402@manjaro.org>
Date: Sun, 26 Jul 2015 12:54:55 +0200
MIME-Version: 1.0
In-Reply-To: <20150726084154.GA14829@nazgul.tnic>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Borislav,

I can confirm your patch working. However, it might be good to use yours
and Thomas' in combination to solve this properly.

kind regards
Philip

On 26.07.2015 10:41, Borislav Petkov wrote:
> On Sun, Jul 26, 2015 at 10:13:45AM +0200, Thomas Gleixner wrote:
>> On Sun, 26 Jul 2015, Philip Müller wrote:
>>>> task: f58e0000 ti: f58e8000 task.ti: f58e800
>>>> EIP: 0060:[<c135a903>] EFLAGS: 00010206 CPU: 0
>>>> EIP is at free_cache_attributes+0x83/0xd0
>>>> EAX: 00000001 EBX: f589d46c ECX: 00000090 EDX: 360c2000
>>>> ESI: 00000000 EDI: c1724a80 EBP: f58e9ec0 ESP: f58e9ea0
>>>>  DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
>>>> CR0: 8005003b CR2: 000000ac CR3: 01731000 CR4: 000006d0
>>
>> That's a trivial NULL pointer dereference in the error/cleanup
>> path. Patch below should fix it.
> 
> Well, I got a bit different, and of course totally untested possible
> solution:
> 
> cache_shared_cpu_map_setup() does check sib_cpu_ci->info_list before
> setting cpumask bits while cache_shared_cpu_map_remove() doesn't. Ballancing
> this out would mean:
> 
> ---
> diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
> index 764280a91776..8a4546dc25e3 100644
> --- a/drivers/base/cacheinfo.c
> +++ b/drivers/base/cacheinfo.c
> @@ -148,7 +148,11 @@ static void cache_shared_cpu_map_remove(unsigned int cpu)
>  
>  			if (sibling == cpu) /* skip itself */
>  				continue;
> +
>  			sib_cpu_ci = get_cpu_cacheinfo(sibling);
> +			if (!sib_cpu_ci->info_list)
> +				continue;
> +
>  			sib_leaf = sib_cpu_ci->info_list + index;
>  			cpumask_clear_cpu(cpu, &sib_leaf->shared_cpu_map);
>  			cpumask_clear_cpu(sibling, &this_leaf->shared_cpu_map);
> ---
> 
> Now Philip can have some more fun testing :-)
>