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 S1753180AbcBGI14 (ORCPT <rfc822;w@1wt.eu>);
	Sun, 7 Feb 2016 03:27:56 -0500
Received: from mail-lf0-f45.google.com ([209.85.215.45]:34854 "EHLO
	mail-lf0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750819AbcBGI1z (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Sun, 7 Feb 2016 03:27:55 -0500
MIME-Version: 1.0
In-Reply-To: <20160206181856.GA7465@hudson.localdomain>
References: <20160205180502.GA5869@hudson.localdomain>
	<20160205141940.ecc0110b00347a264c868c43@linux-foundation.org>
	<20160206181856.GA7465@hudson.localdomain>
Date: Sun, 7 Feb 2016 11:27:53 +0300
Message-ID: <CALYGNiOgL+W5hZeT9dA22ORgvyOQiX3QKU9ZGWzrgrH6EtofZg@mail.gmail.com>
Subject: Re: [REGRESSION] mm: filemap_map_pages NULL pointer dereference
From: Konstantin Khlebnikov <koct9i@gmail.com>
To: Jeremiah Mahler <jmmahler@gmail.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Matthew Wilcox <matthew.r.wilcox@intel.com>,
        Hugh Dickins <hughd@google.com>,
        Mel Gorman <mgorman@techsingularity.net>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Konstantin Khlebnikov <koct9i@gmail.com>
Content-Type: text/plain; charset=UTF-8
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sat, Feb 6, 2016 at 9:18 PM, Jeremiah Mahler <jmmahler@gmail.com> wrote:
> Andrew,
>
> On Fri, Feb 05, 2016 at 02:19:40PM -0800, Andrew Morton wrote:
>> On Fri, 5 Feb 2016 10:05:02 -0800 Jeremiah Mahler <jmmahler@gmail.com> wrote:
>>
> [...]
>> >   unable to handle kernel NULL pointer dereference
>>
>> This should fix it up.
>>
> [...]
>>
>>  include/linux/radix-tree.h |    6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff -puN include/linux/radix-tree.h~radix-tree-fix-oops-after-radix_tree_iter_retry include/linux/radix-tree.h
>> --- a/include/linux/radix-tree.h~radix-tree-fix-oops-after-radix_tree_iter_retry
>> +++ a/include/linux/radix-tree.h
>> @@ -400,7 +400,7 @@ void **radix_tree_iter_retry(struct radi
>>   * @iter:    pointer to radix tree iterator
>>   * Returns:  current chunk size
>>   */
>> -static __always_inline unsigned
>> +static __always_inline long
>>  radix_tree_chunk_size(struct radix_tree_iter *iter)
>>  {
>>       return iter->next_index - iter->index;
>> @@ -434,9 +434,9 @@ radix_tree_next_slot(void **slot, struct
>>                       return slot + offset + 1;
>>               }
>>       } else {
>> -             unsigned size = radix_tree_chunk_size(iter) - 1;
>> +             long size = radix_tree_chunk_size(iter);
>>
>> -             while (size--) {
>> +             while (--size > 0) {
>>                       slot++;
>>                       iter->index++;
>>                       if (likely(*slot))
>> _
>>
>
> I have applied this patch to my kernel and so far the bug has not
> come back.  Thanks for the quick fix.
>
> Although I don't quite understand how this fixes the slot==NULL problem.
> Unless I am missing something, it looks like the while loop will be
> executed the same number of times but the size variable will no
> longer go negative as it did before.

That's simple. Slot is dereferenced after checking remaining size.
Old version checked only for != 0. After iter-retry size is zero and
afrer "- 1" it overlaps into positive range. In new version it's signed and
checked for > 0.

>
> --
> - Jeremiah Mahler