From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 99C19479887; Sat, 12 Sep 2026 12:00:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789214409; cv=none; b=Buv2S83Z/zE3O8uVs/hTuBDbWTJo3sWJNJzKoGqk/z1Z2XKcLjrSxtQBr0k9ZHTTzCyJOeyOyqm4kVsEVQ0CpW9xJzD2wZPEG70+jDvLq1S08NO6Yd5ezR76kDDLSZjQj8cWVKTXoD0tBdJyhng7wtxsPIoJh3PBPBQI9dWcOpo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789214409; c=relaxed/simple; bh=UTCBksL6JWptEw0Ix77wR5Otd/Ttq4hpmu91ilYKaNY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JADo6bLixfU8jJ+YHWMp/4ifVTrbfxKTE8MmLG5cyEvvkniFXt/sWdHmWo7cOcENozH/7kbISxarwaKi+enP9XHXJ2wOGyZ1l6vY1GG1Jg6NASlPnO0HCoixToR7uoA6X8DdmVG2LK7K14TobEYflSS3MydniJLMjYHgGydARu0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2gYobS9L; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="2gYobS9L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E10AF1F000FF; Sat, 12 Sep 2026 12:00:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789214408; bh=4grk1sO0o4bjhet/C4tDfuFfwqdJU2GGl49eyLPWQns=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=2gYobS9LucUvLE67r+1pgxETuoQiNCvkYpmABz7SrxD1AA1I9tBYiZb1juBSsDVmM 3DZOHxvuF+OKkGhDP0SnPkIe3A+FX3vj0RvenXh+gT/Y8RA016npAA0fLatbrl9mrX M9IPqvst5Q7/lWwByBHdZAM+S2SyvgIdngPMpH+I= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sashiko , Jens Remus , "Borislav Petkov (AMD)" , Nathan Chancellor , "Peter Zijlstra (Intel)" , Sasha Levin Subject: [PATCH 6.12 0319/1376] x86/cfi: Use symmetric SYM_START and SYM_END in __CFI_TYPE() Date: Sat, 12 Sep 2026 08:45:45 +0200 Message-ID: <20260912065614.658158373@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065607.535295758@linuxfoundation.org> References: <20260912065607.535295758@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jens Remus [ Upstream commit 0cfdf974f133e0ff17ed80e7895adbe7889d9522 ] Commit ccace936eec7 ("x86: Add types to indirectly called assembly functions") introduced a x86-specific implementation of __CFI_TYPE() using an asymmetric combination of SYM_START() and SYM_FUNC_END() to add a symbol to the KCFI type identifier that precedes a function. This asymmetric combination is an issue if SYM_FUNC_END() ever gets extended in a way that requires it to be used symmetrically with SYM_FUNC_START*(). For instance to emit DWARF CFI directives that denote the start/end of a function. [1] Use SYM_END() with SYM_T_FUNC instead. No functional change, as the generic implementation of SYM_FUNC_END(name) expands into SYM_END(name, SYM_T_FUNC). Fixes: ccace936eec7 ("x86: Add types to indirectly called assembly functions") Closes: https://sashiko.dev/#/patchset/20260522110427.2816637-1-jremus@linux.ibm.com?part=3 [1] Reported-by: Sashiko Signed-off-by: Jens Remus Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Nathan Chancellor Acked-by: Peter Zijlstra (Intel) Link: https://patch.msgid.link/20260611155716.830563-1-jremus@linux.ibm.com Signed-off-by: Sasha Levin --- arch/x86/include/asm/linkage.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h index dc31b13b87a0d..e9daba8961115 100644 --- a/arch/x86/include/asm/linkage.h +++ b/arch/x86/include/asm/linkage.h @@ -103,7 +103,7 @@ .byte 0xb8 ASM_NL \ .long __kcfi_typeid_##name ASM_NL \ CFI_POST_PADDING \ - SYM_FUNC_END(__cfi_##name) + SYM_END(__cfi_##name, SYM_T_FUNC) /* UML needs to be able to override memcpy() and friends for KASAN. */ #ifdef CONFIG_UML -- 2.53.0