Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp3772073pxt; Tue, 10 Aug 2021 10:58:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2wbIzpFRcAIUVG/SRB2fjp32Zihwxd1bP5FWD8HOiR7hoVlQ570+Kl0btrMPY3FIiqdv+ X-Received: by 2002:a6b:e713:: with SMTP id b19mr17296ioh.19.1628618318719; Tue, 10 Aug 2021 10:58:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628618318; cv=none; d=google.com; s=arc-20160816; b=Q56vGDY0JJLf9qR0V3SIY16oC66My+YhOTY+G5iWV9PUyJ0ah4E1huqS4IWd94pIBq 4A1vrosyPipiNjyTCXL8MDeDrHs22H+N+yNw4CYp4EIKID9TdIlq7GyM1zMvARnVNylC MdinHLmlkrulvVA/XV9AfunIMO9p1H8clyQj4V1XR3tmfkUcn5dc+/IuRA3lf/oA2orI AEWAAankuEaTnKhkAEBoX//ynDgwO1DJjJpinXxD7/ws7QtaPkKL+hyGw7aUJHI483ya KTvHaYbLbDYh2ymBAzh1OLee+L/7Ithb4sWIPoAGHzz43oYDBwsSJCtGRgk6WHOaiZ77 Q6zQ== 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=8EHhp2mmcRJEXd8ZBic/QZmr9+rx7dICmrO01kgihTM=; b=JIqj4c4/W3QzoIdgwqN+7uxBcCveh7Z6P6LrNR6zymbhXLy+WWeAXgmDNjNjht8D0K rVLk3LdBKsBKRpzh+dtoMW9v/wwbU6sx02+1ZgKALJ/st6TmEqGhDPRnbPxibPjhKkqG d+PARYoRzTgQ8VmG8SoUcFLoIqoK94C3z2C2issRdgtPI3+gPyag2WeCXmTsvVq74E5w sy0DnPL03iOUXtjelC+D5bzG9rwh9SpuM8M+VpETrSUFC3EEJCBpi0D2bpoTL8Jo4cHD NmT9HkHXEjyf/1ZgysxBa25KjjICVrH7aqeNwJDUSfxTTSdNFgZZLkN2+Ybuz8OR/tub XFjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JjQnHOlT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m16si12376579jat.17.2021.08.10.10.58.24; Tue, 10 Aug 2021 10:58:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JjQnHOlT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235615AbhHJR4j (ORCPT + 99 others); Tue, 10 Aug 2021 13:56:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:53654 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236922AbhHJRxn (ORCPT ); Tue, 10 Aug 2021 13:53:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7163F61361; Tue, 10 Aug 2021 17:43:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628617437; bh=Go60ThmHXscegeuQYcMBmI7Z5VB9f+0G8+vWx9I0Tvg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JjQnHOlTwEMp2dWVglaM0XX7QiXWXPq2p+QdEhqVObg5a508Cmr9jL4hlFLWh+nLU nyO+RKfmFtzCch8+U9mDld473UK0wtuGO/TX9U657W3xifh3bmji6ecnTkrFPsDE0J Jwe95FX25SaMrCHW7x4W/7kkPMLEh45fhXLtLrPw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guenter Roeck , Palmer Dabbelt , Sasha Levin Subject: [PATCH 5.13 057/175] riscv: Disable STACKPROTECTOR_PER_TASK if GCC_PLUGIN_RANDSTRUCT is enabled Date: Tue, 10 Aug 2021 19:29:25 +0200 Message-Id: <20210810173002.819465277@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810173000.928681411@linuxfoundation.org> References: <20210810173000.928681411@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guenter Roeck [ Upstream commit a18b14d8886614b3c7d290c4cfc33389822b0535 ] riscv uses the value of TSK_STACK_CANARY to set stack-protector-guard-offset. With GCC_PLUGIN_RANDSTRUCT enabled, that value is non-deterministic, and with riscv:allmodconfig often results in build errors such as cc1: error: '8120' is not a valid offset in '-mstack-protector-guard-offset=' Enable STACKPROTECTOR_PER_TASK only if GCC_PLUGIN_RANDSTRUCT is disabled to fix the problem. Fixes: fea2fed201ee5 ("riscv: Enable per-task stack canaries") Signed-off-by: Guenter Roeck Signed-off-by: Palmer Dabbelt Signed-off-by: Sasha Levin --- arch/riscv/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 18ec0f9bb8d5..3c3647ac33cb 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -489,6 +489,7 @@ config CC_HAVE_STACKPROTECTOR_TLS config STACKPROTECTOR_PER_TASK def_bool y + depends on !GCC_PLUGIN_RANDSTRUCT depends on STACKPROTECTOR && CC_HAVE_STACKPROTECTOR_TLS config PHYS_RAM_BASE_FIXED -- 2.30.2