From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 766E215A85E for ; Thu, 23 Jan 2025 19:08:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737659285; cv=none; b=pNJG8n9pPX5Tp4MeAJX8J/DjD2tajO8VvJfna7k0t4iK6GsRwHIzEPOeG2Y1cS7k5XNRQY1GqiJuMAQQrDirO9lrrasriF1wNl1EzXH5gR4LRo/o8ofS/3UbKe4vCSGomgxiylyS87zAO0FEuuN7QgIVq9iUrYR8962+ICW0duM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737659285; c=relaxed/simple; bh=5BWj/e9ytZtlPdOQ5xQiGztWQDHjPEWEmXyRghVBn14=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e29AFIeRyivQCPZWE8sal9SmmTK2y89kNrW2MfyeyP5U7PSNKx4Y2o2FNDbyK0j4wgE1tgdTtMSq0GuWm15VUwG0M1z8kT1mS6nF5SIvcsEBhf37qT99Sz7CKauNmtXUEFC1zSlz+UbGm4VVrTvd6adrU5gtGqOlOOYMvFnGxro= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=N8K3vTnG; arc=none smtp.client-ip=209.85.160.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="N8K3vTnG" Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-4678cce3d60so12971611cf.2 for ; Thu, 23 Jan 2025 11:08:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737659282; x=1738264082; 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=GSLVKrkq8Z5PhnWZVyHBClujXDE7cZMJq1Yuy9oRGz8=; b=N8K3vTnGECavHdp4qf6iOp8fnTXlR9VcEdUPzfWbCtxat35IuG1CdoDG2NGaPZxg8L 7e8TLi67j7/+ad1mCAgx83WMJ4aZJJRWLd5QelTgTjJHR5Uz+WshoxqMFarfYIPDMq6h oSrDY5fcywsjL+4biyjx2GTJXTiFE5oc0Bs7/qhNtFN8sPqg5OgPc9Y53Ftvpb0hmCM4 XkoyF8HxBlKSzcnH0MRczAn5qZDGH0miqFEcGy9mbI2+PCUxO4YfStESpM9nj76ZSgWj I7lGdUxek5h57HMz44SxRd2vVGucBHThLFaxT/PiR7lt/XT6r6EQ4Z9xOovjOV+mkv0s bmdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737659282; x=1738264082; 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=GSLVKrkq8Z5PhnWZVyHBClujXDE7cZMJq1Yuy9oRGz8=; b=nKf8KLidYSasT+fAcK3NtIDLSoj370xZ04FhTwxCtROqOUnI7NdgEN6WX1CL3cGheJ PUUqKjv2CoQ0yoc+eD4yIM2hKGMvYg36PMR42jvs5xvjCV7k5M0OTGSw4auzLsYWHx92 Te0kDz2znS/a95SvQLEDeJgE3ddSsVCY5xp+lvg+TV/t3em6a5x1ZheDwtC8t4bEjjlj ohXXkAb3Lwum0Lt/NnSQrohag4QxWnxlSrykNAYrqXzVnTieJvzIrfC9GkeYEgVstfF7 ScdyIaHa7n2HoHW78y+rKRq7riZ8M7KzpymM/5fcMmEnO/On2+WQVbnVcAPD0uj0NU8q 3ATA== X-Gm-Message-State: AOJu0Yyu5oXCAogpSM5GCc8oDKqOaPmzQgc/faE5yGFhE33zkaHENgla lzpbB9G+HMRipm4YvhJFIzkhSZP1pVnpG7iuFxNk4rLmmJVaM/9VK3Kp X-Gm-Gg: ASbGncuAKLGfG++tJJC1uaHUArVl0JovlyjrjZUGiqYeNOE6qCLmX27f+e6M708ZL5l EK4kLwCeoH5PsNMdSMpEM8O7iFzdPQ/kOiEosxoKphOruW51Aegr/DkYK81j29k6epLptMF3SXn I1LasN/kAmD8eV+RZ5BKvzG+XftXolwmJwKu0dRGEL7/VTv/7rSBmhAJ3uCcPTLpAsK8UroaegN mLRBcN3n6pOETlbWqN3a4VNhYjNsdixakIxTOSTkEXpo7XKZV2uFxpZteOFlg== X-Google-Smtp-Source: AGHT+IFFhkoIMRRgUsKoMOouWKjZ4y4A5hwSuWg/lqLqjE2C9HQFfz0vQ2HJfR4f8T9rFB8YfpyEYw== X-Received: by 2002:a05:622a:1922:b0:46c:7150:be3c with SMTP id d75a77b69052e-46e12a1fa2cmr437799021cf.2.1737659282087; Thu, 23 Jan 2025 11:08:02 -0800 (PST) Received: from citadel.lan ([2600:6c4a:4d3f:6d5c::1019]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-46e66b880b6sm1768021cf.69.2025.01.23.11.08.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2025 11:08:01 -0800 (PST) From: Brian Gerst To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Ingo Molnar , "H . Peter Anvin" , Thomas Gleixner , Borislav Petkov , Ard Biesheuvel , Uros Bizjak , Brian Gerst Subject: [PATCH v6 05/15] x86/relocs: Handle R_X86_64_REX_GOTPCRELX relocations Date: Thu, 23 Jan 2025 14:07:37 -0500 Message-ID: <20250123190747.745588-6-brgerst@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250123190747.745588-1-brgerst@gmail.com> References: <20250123190747.745588-1-brgerst@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Clang may produce R_X86_64_REX_GOTPCRELX relocations when redefining the stack protector location. Treat them as another type of PC-relative relocation. Signed-off-by: Brian Gerst Reviewed-by: Ard Biesheuvel --- arch/x86/tools/relocs.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c index e937be979ec8..33dffc5c30b5 100644 --- a/arch/x86/tools/relocs.c +++ b/arch/x86/tools/relocs.c @@ -32,6 +32,11 @@ static struct relocs relocs32; static struct relocs relocs32neg; static struct relocs relocs64; # define FMT PRIu64 + +#ifndef R_X86_64_REX_GOTPCRELX +#define R_X86_64_REX_GOTPCRELX 42 +#endif + #else # define FMT PRIu32 #endif @@ -227,6 +232,7 @@ static const char *rel_type(unsigned type) REL_TYPE(R_X86_64_PC16), REL_TYPE(R_X86_64_8), REL_TYPE(R_X86_64_PC8), + REL_TYPE(R_X86_64_REX_GOTPCRELX), #else REL_TYPE(R_386_NONE), REL_TYPE(R_386_32), @@ -861,6 +867,7 @@ static int do_reloc64(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym, case R_X86_64_PC32: case R_X86_64_PLT32: + case R_X86_64_REX_GOTPCRELX: /* * PC relative relocations don't need to be adjusted unless * referencing a percpu symbol. -- 2.47.1