From nobody Sat Jun 13 22:12:29 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 57E31480949; Tue, 5 May 2026 10:56:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777978599; cv=none; b=N7BoN7LBufbBOZ8X+fQDsruZJ2OIOIDuR9aZeaBkGLd9SosYNXKoep7dc8kjUJtyePNpB9EAk6rTtNh8qljFOf6dPLF+h1/P/MKRnKawYNOYZeMy+jofYGsjy6uVLvS1m/yMCd+2UhA01EuTuwUQsjotXfsDvvh/ukRHlQ2fPyg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777978599; c=relaxed/simple; bh=kdkSQEVNFOHtiqYud3AFN93NnVluSwWtPpq9EIaEa0k=; h=Date:From:To:Subject:Cc:MIME-Version:Message-ID:Content-Type; b=fxYx3cRu47IqKUlrE8z9gLnVNELstsJXbs8pDzoROipY9BFGdC1R3cWz83nHjSqB5AF7SBLWaaXLs/0duwx4pkDJ0xbp4LvO8akp0y+XzM785o0tbwR0tg8FszJtfM4VyT+NrRS4GzIpttjiaoEbS1WgzSKeBFSo6XaVZo5tF6s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=OGuF8rbE; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Lgy1qS7p; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="OGuF8rbE"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Lgy1qS7p" Date: Tue, 05 May 2026 10:56:35 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1777978597; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=htFMYgTH5C5pPZCEzyvElff85mSExys5w01cNrRtvSY=; b=OGuF8rbE4yg+zusxjHHFLveuYBCJTx2BCRA6/iyCc4ZzcJ+mbqLKeH3Jz8dGW7uKiJGteP yxJVmy9b5kjSdaM1HiceySadbHkaQA0yUIdS/SLf+5Cu+Ol8BTCZ7TiGOfjy5c4QFOro6V 6ilZUTBqkQRnEoh4yEV/jp/+rrB1BmWwM2NpOMTo6Mf7ZNArv9SDF/hxn79J51WNSMqAc6 wJwg6ODKZFkBD6QeIPIIWHxhpheMZLLUWQDAa/O/4pZ/ND1NMOcmKSXBP/LpjhcR3PYRdA 6+sQTIbzF4UF0DYRapBw9aO+l374Snl84GPSPsrF2zX31xzD7VVdr6sJ+PiXEQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1777978597; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=htFMYgTH5C5pPZCEzyvElff85mSExys5w01cNrRtvSY=; b=Lgy1qS7pAHREgDKMvfX/iZqc5UzKKgtMxIMbfCmO3WmOr/B3VtF+wVBdiU9UR6LwXTYtPA 2WDvhxsHdHec+VAA== From: "tip-bot2 for Josh Poimboeuf" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/core] objtool/klp: Fix relocation conversion failures for R_X86_64_NONE Cc: Song Liu , Miroslav Benes , Josh Poimboeuf , x86@kernel.org, linux-kernel@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177797859580.424702.789704074510505057.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the objtool/core branch of tip: Commit-ID: 3787e82a4e3a0a04aeb5543580ee90bed3a36e55 Gitweb: https://git.kernel.org/tip/3787e82a4e3a0a04aeb5543580ee90bed= 3a36e55 Author: Josh Poimboeuf AuthorDate: Mon, 20 Apr 2026 22:59:12 -07:00 Committer: Josh Poimboeuf CommitterDate: Mon, 04 May 2026 21:16:01 -07:00 objtool/klp: Fix relocation conversion failures for R_X86_64_NONE Objtool has some hacks which NOP out certain calls/jumps and replace their relocations with R_X86_64_NONE. The klp-diff relocation extraction code will error out when trying to copy these relocations due to their negative addend, which would only makes sense for a PC-relative branch instruction. Just ignore them. Fixes: dd590d4d57eb ("objtool/klp: Introduce klp diff subcommand for diffin= g object files") Acked-by: Song Liu Reviewed-by: Miroslav Benes Signed-off-by: Josh Poimboeuf --- tools/objtool/klp-diff.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/objtool/klp-diff.c b/tools/objtool/klp-diff.c index dd0e51d..19bc811 100644 --- a/tools/objtool/klp-diff.c +++ b/tools/objtool/klp-diff.c @@ -1033,6 +1033,9 @@ found_sym: */ static int convert_reloc_sym(struct elf *elf, struct reloc *reloc) { + if (reloc_type(reloc) =3D=3D R_NONE) + return 1; + if (is_reloc_allowed(reloc)) return 0; =20