From nobody Tue Feb 10 15:29:13 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CE8551474D8 for ; Fri, 12 Jul 2024 09:15:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720775712; cv=none; b=aR80SGRDOcs6ibw+Mo/3DpswlefQWtR+ZSw0R0oSFeBrzk0wkYHYChJtoSROoHdRYoPFvLAU453CTk1XCf/zbsyUsQqtfnTjzA9FwKMrj6UCeRnURk8/eBUJMWmJEZy4uh+M/P/c/KLF6oz8BveqWCIIU/7+MJEUATzVfRalhUM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720775712; c=relaxed/simple; bh=9wyGsUvhpp3BzmrvpcjXeXePCvmZCL6LjpIIvAlGvGY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sFToO4JPGIWpVQgwY6ZlPzxywFMLCNBnYbGR2kT0pHhJESqEGsiuMnAS/kFnLUyqLEOzUE//6aFJGG+iG45fdTn869jMl9nWf6QRAG/PN+4qZYqtfPpTJCEzt9Ouhy5Fp6V+KVsLZjtl29TZ+UFbSmRrNqH+P/b9mSPQKwL4x/k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8Bx7vAd9JBmLKEDAA--.10893S3; Fri, 12 Jul 2024 17:15:09 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8BxXcca9JBmW65FAA--.28188S4; Fri, 12 Jul 2024 17:15:08 +0800 (CST) From: Tiezhu Yang To: Josh Poimboeuf , Peter Zijlstra , Huacai Chen Cc: Xi Ruoyao , loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [RFC PATCH 2/4] objtool: Check various types in add_jump_table() Date: Fri, 12 Jul 2024 17:15:04 +0800 Message-ID: <20240712091506.28140-3-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240712091506.28140-1-yangtiezhu@loongson.cn> References: <20240712091506.28140-1-yangtiezhu@loongson.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: AQAAf8BxXcca9JBmW65FAA--.28188S4 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj93XoW7try3AryfXFWkWrW7XFyfKrX_yoW8AryUpF sxG345Kr4avr17WanxtF1kWF98Kwn7WFnrJrsrKF4FvryIyr45KFy2kw13C3WDJr12vw47 Xr45try7WF4UA3gCm3ZEXasCq-sJn29KB7ZKAUJUUUUr529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUU9Fb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2kKe7AKxVWUXVWUAwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07 AIYIkI8VC2zVCFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWU tVWrXwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7V AKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMxCIbckI1I0E14v2 6r1Y6r17MI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17 CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF 0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIx AIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2 KfnxnUUI43ZEXa7IU8EeHDUUUUU== Content-Type: text/plain; charset="utf-8" Signed-off-by: Tiezhu Yang --- tools/objtool/check.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index c89c0d8c35d7..6fa4100206d0 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -2027,6 +2027,7 @@ static int add_jump_table(struct objtool_file *file, = struct instruction *insn, unsigned int prev_offset =3D 0; struct reloc *reloc =3D table; struct alternative *alt; + unsigned long offset; =20 /* * Each @reloc is a switch table relocation which points to the target @@ -2042,12 +2043,27 @@ static int add_jump_table(struct objtool_file *file= , struct instruction *insn, if (prev_offset && reloc_offset(reloc) !=3D prev_offset + 8) break; =20 + if (reloc->sym->type =3D=3D STT_SECTION) { + offset =3D reloc_addend(reloc); + } else if (reloc->sym->local_label) { + offset =3D reloc->sym->offset; + } else if (reloc->sym->type =3D=3D STT_FUNC) { + offset =3D reloc->sym->offset; + } else if (reloc->sym->type =3D=3D STT_OBJECT) { + offset =3D reloc->sym->offset; + } else if (reloc->sym->type =3D=3D STT_NOTYPE) { + offset =3D reloc->sym->offset; + } else { + WARN("unexpected relocation symbol type in %s: %d", + table->sec->name, reloc->sym->type); + return -1; + } + /* Detect function pointers from contiguous objects: */ - if (reloc->sym->sec =3D=3D pfunc->sec && - reloc_addend(reloc) =3D=3D pfunc->offset) + if (reloc->sym->sec =3D=3D pfunc->sec && offset =3D=3D pfunc->offset) break; =20 - dest_insn =3D find_insn(file, reloc->sym->sec, reloc_addend(reloc)); + dest_insn =3D find_insn(file, reloc->sym->sec, offset); if (!dest_insn) break; =20 --=20 2.42.0