Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp1068920pxb; Wed, 6 Apr 2022 08:01:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJys5agYoU6XKUBEn5fm0uTRma8cqwXMhvuMPc8x9o1ChDyAkZahyKY1s0VNdJeWhlSbbBrK X-Received: by 2002:a05:6830:22ea:b0:5b2:35c1:de3c with SMTP id t10-20020a05683022ea00b005b235c1de3cmr3152984otc.282.1649257294164; Wed, 06 Apr 2022 08:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649257294; cv=none; d=google.com; s=arc-20160816; b=0svGO4hwDQ0anyDcppV6CLTFy4P1dkr1t++W8lxZ2TnTfLP1rNB1WaJeZ+2JelAx8T /tb3k0Pod9JfkB/H7TKwepWVEWL+AG0JO2XcakSshxQQMaZm+iAM+72PjADwdJf+w1VY QrvGSo4xjJApR1mYdKN5YfC5Y31VihmpxYmoU0+5r+OBqvBW3w74IPkvoaPiFoBgO/mp o4/qiuQ4UwEnEg7AUk5o5IXCaJLTtSl+ZI27J3xNxpYiCEroG/fsOXOH7ll7Gzn9u14U htpvr6jUAo9zH04DMgn83dHEBJT9jkadaP3CejNqwp/9VT3oSF40uodpu6ycoJoU3ikE ccpA== 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=XTkkhWIriI+nObvDv47sG+GzuRxehSm21BXzN2I5o1Q=; b=GLlcP2q6s2TMQf98jFJlUeyKCdgWYFluL3A/+a6/XYLdbHo0DFkukDPBxRAdb4RCq2 eVQ3kPrauu/nkza92zILC3qtlYDUM0NDzFYToYC1FWH5prilZiP7sP3tZ37JRLp1w05h ILfgzmiUDxeo3OAtUm3b4ojvtozs8SW7w4Wm1S+IYPRNatZl6ekavlXPgS17pACf8JLx jHB/jnXsLnnmM2Ps8heHDvWFewvTYXCiWxAlrISc59SOv4uOyuajr6jeUS44Ck5g7sBZ IQKuZAaZBkrThj0Voj+5urZTylO+MN5MoMgDc4i2lIOAtC87aLtj4YC4bUwFdDvpUpvA PvkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pT1wAOnJ; 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 eq36-20020a056870a92400b000dddbbf32cfsi8531505oab.311.2022.04.06.08.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 08:01:34 -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=pT1wAOnJ; 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AE3AD311ACB; Wed, 6 Apr 2022 05:48:50 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1837049AbiDFAnr (ORCPT + 99 others); Tue, 5 Apr 2022 20:43:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354886AbiDEKQ3 (ORCPT ); Tue, 5 Apr 2022 06:16:29 -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 BC1576CA5F; Tue, 5 Apr 2022 03:03:25 -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 58E6C61676; Tue, 5 Apr 2022 10:03:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6FCA5C385A2; Tue, 5 Apr 2022 10:03:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649153004; bh=U6NPccItde/lV+Aupb+80yWZKd2ruP1llhPD9xnH5U8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pT1wAOnJ0uwWI58A2hHL4QQuSrcZ6VBVdvCEd+WHHxxvpS57T8LTHVmldRTLuEhAd OO2bAjiL9lvND75vAJgFDpbc+cEcHo9J/569ei+JVIdBughmyE1kubkwv19Xn1u6a5 Gbu8YdzOXaoW5FLkiNGpaGqoeJNzH+h8nEg1hS74= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Vyukov , syzbot+0600986d88e2d4d7ebb8@syzkaller.appspotmail.com, Palmer Dabbelt Subject: [PATCH 5.10 066/599] riscv: Increase stack size under KASAN Date: Tue, 5 Apr 2022 09:26:00 +0200 Message-Id: <20220405070300.791256999@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: Dmitry Vyukov commit b81d591386c3a50b96dddcf663628ea0df0bf2b3 upstream. KASAN requires more stack space because of compiler instrumentation. Increase stack size as other arches do. Signed-off-by: Dmitry Vyukov Reported-by: syzbot+0600986d88e2d4d7ebb8@syzkaller.appspotmail.com Fixes: 8ad8b72721d0 ("riscv: Add KASAN support") Cc: stable@vger.kernel.org Signed-off-by: Palmer Dabbelt Signed-off-by: Greg Kroah-Hartman --- arch/riscv/include/asm/thread_info.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/arch/riscv/include/asm/thread_info.h +++ b/arch/riscv/include/asm/thread_info.h @@ -11,11 +11,17 @@ #include #include +#ifdef CONFIG_KASAN +#define KASAN_STACK_ORDER 1 +#else +#define KASAN_STACK_ORDER 0 +#endif + /* thread information allocation */ #ifdef CONFIG_64BIT -#define THREAD_SIZE_ORDER (2) +#define THREAD_SIZE_ORDER (2 + KASAN_STACK_ORDER) #else -#define THREAD_SIZE_ORDER (1) +#define THREAD_SIZE_ORDER (1 + KASAN_STACK_ORDER) #endif #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)