From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E3CBC433F5 for ; Thu, 23 Sep 2021 03:40:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EDAAD61159 for ; Thu, 23 Sep 2021 03:40:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239680AbhIWDmM (ORCPT ); Wed, 22 Sep 2021 23:42:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:42110 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239420AbhIWDky (ORCPT ); Wed, 22 Sep 2021 23:40:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3BA226103C; Thu, 23 Sep 2021 03:39:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632368363; bh=tQHIh3nJ8Y0ZE37+c4HeOpbSFERGAlNWddCWVbrEBEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N5Rh5tGAQPD6zzRtUqkW4HlqLP8e3Bp9f+crPQMavBWPJIZf3voW4gn//ENa+kwLS QJK/3tKZYYesoKRw4tlGESHXiaVgzv0PUwK03PQ0k7Vvdw8fdndacqOTzlpt9Mz5Lv eWRVmJiA2Ks53OirVEaW4qfCl84jTOLDz3j4g92E9hCZhm3GeGUgqTkM5WIbAhIlLs xwukYCDdklq4V+jKzmm0CIjTLJB/4hmu9zWMlqhJUB8BONHEO99mTqp8aXOQvw6pUy kxfwKOfiPVdDKwXbzHadsesOuvDgaQ6snpmt/16CYDr9k9ZgWWhDv5ieIW/keQ4iqx SuZO87a4kheYg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Li , Mark Rutland , Catalin Marinas , Sasha Levin , will@kernel.org, peterz@infradead.org, maz@kernel.org, pcc@google.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 16/19] arm64: Mark __stack_chk_guard as __ro_after_init Date: Wed, 22 Sep 2021 23:38:50 -0400 Message-Id: <20210923033853.1421193-16-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210923033853.1421193-1-sashal@kernel.org> References: <20210923033853.1421193-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Li [ Upstream commit 9fcb2e93f41c07a400885325e7dbdfceba6efaec ] __stack_chk_guard is setup once while init stage and never changed after that. Although the modification of this variable at runtime will usually cause the kernel to crash (so does the attacker), it should be marked as __ro_after_init, and it should not affect performance if it is placed in the ro_after_init section. Signed-off-by: Dan Li Acked-by: Mark Rutland Link: https://lore.kernel.org/r/1631612642-102881-1-git-send-email-ashimida@linux.alibaba.com Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- arch/arm64/kernel/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 7d7cfa128b71..f61ef46ebff7 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -56,7 +56,7 @@ #if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_STACKPROTECTOR_PER_TASK) #include -unsigned long __stack_chk_guard __read_mostly; +unsigned long __stack_chk_guard __ro_after_init; EXPORT_SYMBOL(__stack_chk_guard); #endif -- 2.30.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1C95C43219 for ; Thu, 23 Sep 2021 03:41:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3E41D613A8 for ; Thu, 23 Sep 2021 03:41:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3E41D613A8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Wvq/infphNqqhxjLBLftuf3WLmGRPP5kVeuxFfHg3cg=; b=28P+m+mXdPPhd5 7+thUrjQN9KILNjfXWZKEDBj3DoUG9he9gmnEbFMVzqHADIFqzV+O2Wfqeulqwr/uejQVmdJwbp0N gzEqvtIlSa+J+CvtdOuNxLb90Rj9Yw6fhutY2PqAImMRKnSNZs5ix9/xgdivAK9eFeg8KitPeQ3Vg XgLmTklV1DOiuZjVF/tJo/xr0i/DRpKdpQKjo7Wmd79MVyWohlPupCREWkLkBrx1drZJkQY/LDwbc JiMAkqvC8q7hjrEasVJZc05Znil+5fL2nAG3TSuMojDaHIdLqUK4bQBiXJlyTal9ZJiS6poKWqLf+ Qe6BK8S0g3E47NYzsjyw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mTFa3-00AAlv-V8; Thu, 23 Sep 2021 03:39:28 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mTFZz-00AAkG-LZ for linux-arm-kernel@lists.infradead.org; Thu, 23 Sep 2021 03:39:25 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3BA226103C; Thu, 23 Sep 2021 03:39:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632368363; bh=tQHIh3nJ8Y0ZE37+c4HeOpbSFERGAlNWddCWVbrEBEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N5Rh5tGAQPD6zzRtUqkW4HlqLP8e3Bp9f+crPQMavBWPJIZf3voW4gn//ENa+kwLS QJK/3tKZYYesoKRw4tlGESHXiaVgzv0PUwK03PQ0k7Vvdw8fdndacqOTzlpt9Mz5Lv eWRVmJiA2Ks53OirVEaW4qfCl84jTOLDz3j4g92E9hCZhm3GeGUgqTkM5WIbAhIlLs xwukYCDdklq4V+jKzmm0CIjTLJB/4hmu9zWMlqhJUB8BONHEO99mTqp8aXOQvw6pUy kxfwKOfiPVdDKwXbzHadsesOuvDgaQ6snpmt/16CYDr9k9ZgWWhDv5ieIW/keQ4iqx SuZO87a4kheYg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Li , Mark Rutland , Catalin Marinas , Sasha Levin , will@kernel.org, peterz@infradead.org, maz@kernel.org, pcc@google.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 16/19] arm64: Mark __stack_chk_guard as __ro_after_init Date: Wed, 22 Sep 2021 23:38:50 -0400 Message-Id: <20210923033853.1421193-16-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210923033853.1421193-1-sashal@kernel.org> References: <20210923033853.1421193-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210922_203923_793118_AE7D1EC7 X-CRM114-Status: GOOD ( 10.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Dan Li [ Upstream commit 9fcb2e93f41c07a400885325e7dbdfceba6efaec ] __stack_chk_guard is setup once while init stage and never changed after that. Although the modification of this variable at runtime will usually cause the kernel to crash (so does the attacker), it should be marked as __ro_after_init, and it should not affect performance if it is placed in the ro_after_init section. Signed-off-by: Dan Li Acked-by: Mark Rutland Link: https://lore.kernel.org/r/1631612642-102881-1-git-send-email-ashimida@linux.alibaba.com Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- arch/arm64/kernel/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 7d7cfa128b71..f61ef46ebff7 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -56,7 +56,7 @@ #if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_STACKPROTECTOR_PER_TASK) #include -unsigned long __stack_chk_guard __read_mostly; +unsigned long __stack_chk_guard __ro_after_init; EXPORT_SYMBOL(__stack_chk_guard); #endif -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel