Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp5464178rwb; Wed, 17 Aug 2022 18:52:26 -0700 (PDT) X-Google-Smtp-Source: AA6agR586wDZkrxb7XRQFCQOPjWEmx+YP6R1KvfOC8recV3szXzipBonW9jsdIlLrOpQfBMS78xv X-Received: by 2002:a17:90a:4291:b0:1f2:2a19:fc95 with SMTP id p17-20020a17090a429100b001f22a19fc95mr6396541pjg.29.1660787546038; Wed, 17 Aug 2022 18:52:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660787546; cv=none; d=google.com; s=arc-20160816; b=JttVOInaTWHR33QV0aMV3NrG4IgFLSSSKzxTTo0AFyTAp2guG9YTByWCMa9SIVArzZ ckZ+As0INVhJrPdxKet9GMFJh3MjS5txFVLmKysVP30/pL7wJ6xy0D5BneFAaI1g/nLE VIbhXuIwF2rEG6x7V5fBZXYoca+BENM0pBzZm18mPl86OR0jds+CWQfSmt9zR7P7bxM9 dpHsd1vfprQVsqJpp7gdd4BBBvvjdrXhwg6tjTgZGNl9f5fIyUzZTodWLNZYhxB7ctSi enIPU3Yx+3TkL8kZ2gLy7AsB8sSjBYLOJDMH9u9lDQxhkEHv/f5/xRt/mdyINcAuMe7C XPxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=3ukx4jMRUx+Wd5RmxUNtYBEyqyMRmX+Kro8wqePMnoo=; b=O2cCUw12A4oBpNk6Pnot5bFjldYUvOoH98yP6w4mNJsLnYi2Ax9BpHOpnrSRvs9e0R s4ag/X/yzNZULNl3iJXfO48wqcBwf/XlqUjWkrfvXo/F3tnaBNxzN3iAcH2of223Mp9U 4wbpgJJhFipkQF/va5aXqu9URMaED6IFGdB98EvXKZQRdV/3vOqK+TjiKogEfROrQeXx TrbSBgh8ygiG2fPuzSJ/NwgZ6tzXPvZ3RxW/bwr4e3B8VWRbJ01+fDi8CKdozdBpLekd ppDaM8HrIhzU5Zakb1t9fAX044x1lRebc3m8zZq/TTUPV41EYn46BJ99yx5Tw3pj+r0J P39Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d186-20020a6368c3000000b0041be4774a55si132219pgc.800.2022.08.17.18.52.14; Wed, 17 Aug 2022 18:52:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242558AbiHRBtG (ORCPT + 99 others); Wed, 17 Aug 2022 21:49:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239291AbiHRBtD (ORCPT ); Wed, 17 Aug 2022 21:49:03 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1BA902980F for ; Wed, 17 Aug 2022 18:49:01 -0700 (PDT) Received: from dggpemm500022.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4M7SSG0R50zGpg5; Thu, 18 Aug 2022 09:47:26 +0800 (CST) Received: from dggpemm500013.china.huawei.com (7.185.36.172) by dggpemm500022.china.huawei.com (7.185.36.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 18 Aug 2022 09:48:59 +0800 Received: from ubuntu1804.huawei.com (10.67.175.36) by dggpemm500013.china.huawei.com (7.185.36.172) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 18 Aug 2022 09:48:59 +0800 From: Chen Zhongjin To: CC: , , Subject: [PATCH -next] objtool: use arch_jump_destination in read_intra_function_calls Date: Thu, 18 Aug 2022 09:45:53 +0800 Message-ID: <20220818014553.220261-1-chenzhongjin@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.175.36] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm500013.china.huawei.com (7.185.36.172) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org arch_jump_destination() is used instead of offset + len + immediate for jump destination. But in read_intra_function_calls it didn't get changed. It can make trouble for other arches development such as arm or ppc. Fix it. Signed-off-by: Chen Zhongjin --- tools/objtool/check.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 0cec74da7ffe..b012d987a658 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -2233,7 +2233,7 @@ static int read_intra_function_calls(struct objtool_file *file) */ insn->type = INSN_JUMP_UNCONDITIONAL; - dest_off = insn->offset + insn->len + insn->immediate; + dest_off = arch_jump_destination(insn); insn->jump_dest = find_insn(file, insn->sec, dest_off); if (!insn->jump_dest) { WARN_FUNC("can't find call dest at %s+0x%lx", -- 2.17.1