From patchwork Tue Jun 11 20:11:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuxuan Luo X-Patchwork-Id: 1946547 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VzKb04Nm8z23v8 for ; Wed, 12 Jun 2024 06:12:11 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1sH7qa-0004WH-H4; Tue, 11 Jun 2024 20:12:00 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sH7qY-0004Ur-8Y for kernel-team@lists.ubuntu.com; Tue, 11 Jun 2024 20:11:58 +0000 Received: from mail-vk1-f200.google.com (mail-vk1-f200.google.com [209.85.221.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 14DFC3F63C for ; Tue, 11 Jun 2024 20:11:58 +0000 (UTC) Received: by mail-vk1-f200.google.com with SMTP id 71dfb90a1353d-4ed0626ac95so46585e0c.3 for ; Tue, 11 Jun 2024 13:11:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718136716; x=1718741516; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UzNBmxnZBQznJl8AkOO/aPMinGHAEqPMwebWJdRqdFo=; b=QTv9mihNoqrSukj1dZQwARZDkx27TO5C9v9SHgNq4wo/4ubSR+4fGfhnF8+5qIN684 BkRM5MUfMyMGH5ixLJCtIGrEUo77bB2kSQ7EgoindNiXKx3sONYfhpHFOWfSphRXv2B9 4tNb2Pl7JWDalEjoXkwlJaGIoYxDZNDFWVB0iryf/ZV5jO2fKkC7C/WK3CSztqZhVuQR FvW9KOGMlrxOYXSydZ51wkLc98zd8s+DWRoCzNq6pL7ARwbYpNGmnS9cA6Bsncofxq6h woNgWJd/ZsLnfnGA15r+jOUClqECQJj5lHtpFSL1D/D2vWci5kO2PqQN5NUboHr5x1dr rdug== X-Gm-Message-State: AOJu0YxlerFi9FkEFLpBroVxxPBRMdfucTyTE19a4uMlckJfyAPeyTmQ 6XLsuSUZRryOdy9m/5q3Ya/AmphSswh7xC5fD7zuUDRVK60PsQjsBQhPQS5c7RXZOyE61x4+IWR hzKuG6rt57+yVAYvOCjHKn+mIsEtJvpQ4fcpauCKfodQWybIcjwY0iYTNO8QWTXCyVKCwEzQGlx /G4Cxn93SINw== X-Received: by 2002:a1f:6d44:0:b0:4d3:36b9:2c26 with SMTP id 71dfb90a1353d-4eb562bfe7amr11251606e0c.14.1718136716022; Tue, 11 Jun 2024 13:11:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFGJf0B3Dx0X89VFagPsZmTZv23toJEeMVgg1DjKWpEM8j0bTf5bQhsWckBaJ5GeA98BQH0Eg== X-Received: by 2002:a1f:6d44:0:b0:4d3:36b9:2c26 with SMTP id 71dfb90a1353d-4eb562bfe7amr11251577e0c.14.1718136715452; Tue, 11 Jun 2024 13:11:55 -0700 (PDT) Received: from localhost.localdomain ([2001:67c:1562:8007::aac:4795]) by smtp.gmail.com with ESMTPSA id af79cd13be357-795331c493asm545340885a.104.2024.06.11.13.11.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 13:11:54 -0700 (PDT) From: Yuxuan Luo To: kernel-team@lists.ubuntu.com Subject: [Jammy][PATCH 1/6] x86: Fix misspelled Kconfig symbols Date: Tue, 11 Jun 2024 16:11:40 -0400 Message-Id: <20240611201145.183510-5-yuxuan.luo@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240611201145.183510-1-yuxuan.luo@canonical.com> References: <20240611201145.183510-1-yuxuan.luo@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Lukas Bulwahn Fix misspelled Kconfig symbols as detected by scripts/checkkconfigsymbols.py. [ bp: Combine into a single patch. ] Signed-off-by: Lukas Bulwahn Signed-off-by: Borislav Petkov Link: https://lkml.kernel.org/r/20210803113531.30720-7-lukas.bulwahn@gmail.com (cherry picked from commit 6bf8a55d8344df1f61a29b18c398bcdf3539e163) CVE-2024-25744 Signed-off-by: Yuxuan Luo --- arch/x86/include/asm/ia32.h | 2 +- arch/x86/include/asm/irq_stack.h | 2 +- arch/x86/include/asm/page_32.h | 2 +- arch/x86/include/asm/uaccess.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h index 2c5f7861d373c..fada857f0a1ed 100644 --- a/arch/x86/include/asm/ia32.h +++ b/arch/x86/include/asm/ia32.h @@ -68,6 +68,6 @@ extern void ia32_pick_mmap_layout(struct mm_struct *mm); #endif -#endif /* !CONFIG_IA32_SUPPORT */ +#endif /* CONFIG_IA32_EMULATION */ #endif /* _ASM_X86_IA32_H */ diff --git a/arch/x86/include/asm/irq_stack.h b/arch/x86/include/asm/irq_stack.h index e087cd7837c31..22c5aa03ac77b 100644 --- a/arch/x86/include/asm/irq_stack.h +++ b/arch/x86/include/asm/irq_stack.h @@ -58,7 +58,7 @@ * the output constraints to make the compiler aware that R11 cannot be * reused after the asm() statement. * - * For builds with CONFIG_UNWIND_FRAME_POINTER ASM_CALL_CONSTRAINT is + * For builds with CONFIG_UNWINDER_FRAME_POINTER, ASM_CALL_CONSTRAINT is * required as well as this prevents certain creative GCC variants from * misplacing the ASM code. * diff --git a/arch/x86/include/asm/page_32.h b/arch/x86/include/asm/page_32.h index 94dbd51df58f8..b13f8488ac854 100644 --- a/arch/x86/include/asm/page_32.h +++ b/arch/x86/include/asm/page_32.h @@ -43,7 +43,7 @@ static inline void copy_page(void *to, void *from) { memcpy(to, from, PAGE_SIZE); } -#endif /* CONFIG_X86_3DNOW */ +#endif /* CONFIG_X86_USE_3DNOW */ #endif /* !__ASSEMBLY__ */ #endif /* _ASM_X86_PAGE_32_H */ diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index 3616fd4ba3953..09b4958f5e474 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h @@ -412,7 +412,7 @@ do { \ : [umem] "m" (__m(addr)), \ [efault] "i" (-EFAULT), "0" (err)) -#endif // CONFIG_CC_ASM_GOTO_OUTPUT +#endif // CONFIG_CC_HAS_ASM_GOTO_OUTPUT #ifdef CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT #define __try_cmpxchg_user_asm(itype, ltype, _ptr, _pold, _new, label) ({ \