Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp979680pxb; Wed, 6 Apr 2022 05:56:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/FpngSntIFbTj8G8KggV6ZQY2FavpQEQ+P9dnjXEA7quyjuuZMQ468Y+8cpxheWIlSqPZ X-Received: by 2002:a17:90b:1d02:b0:1c7:1802:c00e with SMTP id on2-20020a17090b1d0200b001c71802c00emr9767187pjb.99.1649249775534; Wed, 06 Apr 2022 05:56:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649249775; cv=none; d=google.com; s=arc-20160816; b=N1NpqO3pcMFKpQ3NfTykS/U+gnGwM+plDWNdwaZPJivglbFYTp6AZyVrdsg3v64dlO TbEyUDjrV5BFcPNUubawO5fAypa00/xe04CYloK+V5S8DNsQvuptyxEwZ60KnVWKjrlo Z/OZ8YHMEz58cfJ8miMs2l+W0+aTh3YFarpsjwdgHTKnSBWNEauC709cXToaegQLqarA RF5z/48cfl72LZkIqUuw11atOm5m3lowH20IZGK0jgCL5KPUcrEIrBFP45ZZqPeXHAiw YYuBA5sxgtYSeoDIInfhkEm2kq0Uvt8zzqPjVV/JubGtStSA0HF7r3y5u9V3ts+vjBLE lg7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WycGEN1I8OvMUyvqHKGFnF1ifMZjdMsqhSqX9B2iNdg=; b=XJZ15Tne0sx06u4dEJmRcYDjLuRvlebcqkt1/vIGr8u6y4edUdrnPxsK66E6vCNAUW mIakNYW+kO9LdjQaHcCfdTA958rTt5LPksTi0Xz4yrG8fW94wHDWU8krhsuGcXZsv6+u z4n8C6ZEfj+rNDElOZhkGo4orr4tPul5BhXwjOmBO7GjpzgxVS4yAFTd8WvpuVAAKxc+ olfKZT8kSzt7tO8wbXOjpc420w6Jm9OrFv5zqBjV7VPJjEEQqzrNhjFNvCXnslxJRqPZ YMVT/u7GPtCgYm0REr+t3LVPLS9Us/8nNZmX4YCNeVEZ+yhbDB1HhcE74Xdc6Qwo+moI fzEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XVDadoXO; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id r27-20020a63205b000000b0038609ba1522si16043054pgm.122.2022.04.06.05.56.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 05:56:15 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XVDadoXO; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9DDB03FF4F0; Wed, 6 Apr 2022 03:05:49 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1578819AbiDEXZC (ORCPT + 99 others); Tue, 5 Apr 2022 19:25:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345111AbiDEKkn (ORCPT ); Tue, 5 Apr 2022 06:40:43 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 037202DAAE; Tue, 5 Apr 2022 03:25:51 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9694761425; Tue, 5 Apr 2022 10:25:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A7CEDC385A0; Tue, 5 Apr 2022 10:25:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649154350; bh=a6oPxCJzwFg+auaLybS3Cz5xCfoOmB6qPAWpGmmbt78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XVDadoXOdGQeFf7zhCfwoxHCL8sJ9uIMRORw6byvTDbpjPod8gnYSnumalRd/xwMc mpYLqnKp/iXDHd3OZumqvvShAmrcqvOY5syCdUzA20se2K+Xgs/7STyorh2SR96n4P A/BElTnYuUQWlJe/khU2jDtuGhA9no5FyzhjQM34= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+0d2b0bf32ca5cfd09f2e@syzkaller.appspotmail.com, "Matthew Wilcox (Oracle)" Subject: [PATCH 5.10 548/599] XArray: Fix xas_create_range() when multi-order entry present Date: Tue, 5 Apr 2022 09:34:02 +0200 Message-Id: <20220405070315.148705763@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070258.802373272@linuxfoundation.org> References: <20220405070258.802373272@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthew Wilcox (Oracle) commit 3e3c658055c002900982513e289398a1aad4a488 upstream. If there is already an entry present that is of order >= XA_CHUNK_SHIFT when we call xas_create_range(), xas_create_range() will misinterpret that entry as a node and dereference xa_node->parent, generally leading to a crash that looks something like this: general protection fault, probably for non-canonical address 0xdffffc0000000001: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f] CPU: 0 PID: 32 Comm: khugepaged Not tainted 5.17.0-rc8-syzkaller-00003-g56e337f2cf13 #0 RIP: 0010:xa_parent_locked include/linux/xarray.h:1207 [inline] RIP: 0010:xas_create_range+0x2d9/0x6e0 lib/xarray.c:725 It's deterministically reproducable once you know what the problem is, but producing it in a live kernel requires khugepaged to hit a race. While the problem has been present since xas_create_range() was introduced, I'm not aware of a way to hit it before the page cache was converted to use multi-index entries. Fixes: 6b24ca4a1a8d ("mm: Use multi-index entries in the page cache") Reported-by: syzbot+0d2b0bf32ca5cfd09f2e@syzkaller.appspotmail.com Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Greg Kroah-Hartman --- lib/test_xarray.c | 22 ++++++++++++++++++++++ lib/xarray.c | 2 ++ 2 files changed, 24 insertions(+) --- a/lib/test_xarray.c +++ b/lib/test_xarray.c @@ -1463,6 +1463,25 @@ unlock: XA_BUG_ON(xa, !xa_empty(xa)); } +static noinline void check_create_range_5(struct xarray *xa, + unsigned long index, unsigned int order) +{ + XA_STATE_ORDER(xas, xa, index, order); + unsigned int i; + + xa_store_order(xa, index, order, xa_mk_index(index), GFP_KERNEL); + + for (i = 0; i < order + 10; i++) { + do { + xas_lock(&xas); + xas_create_range(&xas); + xas_unlock(&xas); + } while (xas_nomem(&xas, GFP_KERNEL)); + } + + xa_destroy(xa); +} + static noinline void check_create_range(struct xarray *xa) { unsigned int order; @@ -1490,6 +1509,9 @@ static noinline void check_create_range( check_create_range_4(xa, (3U << order) + 1, order); check_create_range_4(xa, (3U << order) - 1, order); check_create_range_4(xa, (1U << 24) + 1, order); + + check_create_range_5(xa, 0, order); + check_create_range_5(xa, (1U << order), order); } check_create_range_3(); --- a/lib/xarray.c +++ b/lib/xarray.c @@ -722,6 +722,8 @@ void xas_create_range(struct xa_state *x for (;;) { struct xa_node *node = xas->xa_node; + if (node->shift >= shift) + break; xas->xa_node = xa_parent_locked(xas->xa, node); xas->xa_offset = node->offset - 1; if (node->offset != 0)