From patchwork Wed Nov 15 17:36:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Gerst X-Patchwork-Id: 165527 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp2700631vqg; Wed, 15 Nov 2023 09:39:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IGzQx2Fk2dbUE5MUUvgMWs76uFt7ZK3BpwZ9uW6k6pTjpgC59EVQoyg+T2r0J0CRGQ8pO0c X-Received: by 2002:a17:902:e74a:b0:1cc:e76e:f214 with SMTP id p10-20020a170902e74a00b001cce76ef214mr6869475plf.29.1700069945633; Wed, 15 Nov 2023 09:39:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700069945; cv=none; d=google.com; s=arc-20160816; b=nQeTXsJazXkGKdnHDCLu2tfviWfsBu5ztxHiN79g2RjSlHwG94OVPimdRLLhuX2Yy5 ZbkTKBn2+9eD3KCjcrxvDeUJgEjFmZNyIBoc8FB7rdzSb3TIGLeXAnTTjB39sIISRn8F wdo2KGgyiHTp6e4nt0DfZz070JSyivjHoSe6mKSaX3kEjWGKX0Yn35UcMLw3OTn7Bwuk pepae/yv1NquM707EVBqwYKda1bzB2a9pL4ayWhhAeVnJGX047q9bjjf8eYu/q9g/gEg 6psCvo15SgDSm10dfY9SIYQolsYGT0bPXo9Rn+nIz+DTyRIIqieR50SAirPmKgF4F5Jr xSZA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lsKN0vAWTPkRoeR+0eW+M/Vw4EKK+fkuLodskFQx/7g=; fh=O55jSVrVODK5Pp/8HguUJuz95L5ieTggTCPnkrmwi7I=; b=Lfj+C0Qrl/MmAesO0tvNfw5f6QXe/VAbF4G3I2l1CH1kZDg66BHUY9fSWU15vQKHFh duBUpT74BrNw94EEgj0fDnS9BsBcVoqQ+zZ+wqLth1zmWKkTzuCfeM4VvX21PEnEKN6j DvhRqWcRPd0+9vnN20cGSdTsNcWt6VQ+R8Pa4Vc9Gpob2jh/m2SkpnvGgW07ltrd1+gG ut/MvsSWuyNNyNx0LA1RG0cHCjyciWIcsrTsgrX1IX+ovsXZ4NnlAbdfCWW501pp5slj NgvqS5FPWfnm3FbciPO12Q6lY4uwE3Xqgj1YO5b24QZYx5pYbVRY3PplrpyzY+6dbcNu iAZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Wu+HWNRJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id z1-20020a170903018100b001c9d22299e2si10889625plg.437.2023.11.15.09.39.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 09:39:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Wu+HWNRJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 486558092EDE; Wed, 15 Nov 2023 09:37:50 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232666AbjKORhi (ORCPT + 29 others); Wed, 15 Nov 2023 12:37:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232502AbjKORhd (ORCPT ); Wed, 15 Nov 2023 12:37:33 -0500 Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ACFF1BC for ; Wed, 15 Nov 2023 09:37:29 -0800 (PST) Received: by mail-qk1-x729.google.com with SMTP id af79cd13be357-779fb118fe4so433073785a.2 for ; Wed, 15 Nov 2023 09:37:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700069848; x=1700674648; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lsKN0vAWTPkRoeR+0eW+M/Vw4EKK+fkuLodskFQx/7g=; b=Wu+HWNRJP1QjHx24kqcqFNFJCVp93WItLBa+xA7hYcTXz5WmGggUg9mPoYBL8sjgXa a2t6J//qXG5k21HdhLWhjaguy7okJtzL061xu/u39SK9ID/kb9Vc1LiTuEgoTuMRYtcB mxRpotpf7Kb83TwMgjpJ9sx8UDhEWrZfxBB7kl+04JB4xc2WFCv5CsS/0Q8IFKp8h8sN EHQdHT6zU0plpk6Y2Vz2vE2A10IcqGAm+apYWgVUxjXZNDlzivpIN2HTC/5EF1EFR55R wo6dMSgQVLpfQWMaDSSyFX4R+dNuqNVZB86LCODvUcHNyPaY5XIehzlmjUZKIr9Nrj30 xaRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700069848; x=1700674648; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lsKN0vAWTPkRoeR+0eW+M/Vw4EKK+fkuLodskFQx/7g=; b=m/eNDQWx/INaONHUHWYPkb84xWMdnJFIKrZ9cx+rQPWgnUHUxxY/bqXDH/EqY3EdPu +Nbx6EhhIghIahftoOcQglH4EGPBFAh+GPhCT/itCOLX13J6ze30au2YgvYWeF0cZiNq iZ3DY6YWaMMFSRvqJorzx+H/Chyy2pitO9bKa55jFLN4OJ74GwZAPyitGc+76dxAZOHC hjdebfvamXo4ffN749kxKuUTFVwEvTHsGnaUqeNR6SmvF0UPe327q9+3V0V3El0DvMGs nWaRd2do6NsGh1rbraW/TCpu8XAIdO7+Oc340FZOZRS1G9OaXKuBAIUcti0xKXVqXMpN jL4w== X-Gm-Message-State: AOJu0YxJLxYNJDfdus2onDaWbSYeF6gHVJzNsreH9SmIsurspnBADYAp ZvRzL8NsjuigsrgRboks/cciKA3MNQ== X-Received: by 2002:a05:620a:6409:b0:779:d143:c1a7 with SMTP id pz9-20020a05620a640900b00779d143c1a7mr6814784qkn.26.1700069848097; Wed, 15 Nov 2023 09:37:28 -0800 (PST) Received: from citadel.lan ([2600:6c4a:4d3f:6d5c::1019]) by smtp.gmail.com with ESMTPSA id x20-20020a05620a0b5400b0077bda014d8esm3260099qkg.87.2023.11.15.09.37.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 09:37:27 -0800 (PST) From: Brian Gerst To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Ingo Molnar , Thomas Gleixner , Borislav Petkov , "H . Peter Anvin" , Peter Zijlstra , Uros Bizjak , David.Laight@aculab.com, Brian Gerst Subject: [PATCH v3 03/14] x86/boot: Disable stack protector for early boot code Date: Wed, 15 Nov 2023 12:36:57 -0500 Message-ID: <20231115173708.108316-4-brgerst@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231115173708.108316-1-brgerst@gmail.com> References: <20231115173708.108316-1-brgerst@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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 X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 15 Nov 2023 09:37:50 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782652543079674506 X-GMAIL-MSGID: 1782652543079674506 On 64-bit, this will prevent crashes when the canary access is changed from %gs:40 to %gs:__stack_chk_guard(%rip). RIP-relative addresses from the identity-mapped early boot code will target the wrong address with zero-based percpu. KASLR could then shift that address to an unmapped page causing a crash on boot. This early boot code runs well before userspace is active and does not need stack protector enabled. Signed-off-by: Brian Gerst --- arch/x86/kernel/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 0000325ab98f..aff619054e17 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -39,6 +39,8 @@ KMSAN_SANITIZE_nmi.o := n KCOV_INSTRUMENT_head$(BITS).o := n KCOV_INSTRUMENT_sev.o := n +CFLAGS_head32.o := -fno-stack-protector +CFLAGS_head64.o := -fno-stack-protector CFLAGS_irq.o := -I $(srctree)/$(src)/../include/asm/trace obj-y += head_$(BITS).o