Received: by 2002:ac0:da4c:0:0:0:0:0 with SMTP id a12csp1659384imi; Sat, 23 Jul 2022 12:56:09 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uhPw7klTHCSt0PGXJSfVrXHDMUvrD3U2DxXf/HM1YYScWpBHhpL5HrTyYTAWnylLPm3or/ X-Received: by 2002:a17:906:9b93:b0:72b:8fad:6cf8 with SMTP id dd19-20020a1709069b9300b0072b8fad6cf8mr4348918ejc.415.1658606169327; Sat, 23 Jul 2022 12:56:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658606169; cv=none; d=google.com; s=arc-20160816; b=Aykz+IbGHNT/y8oLTtdENKsGUODWGDnKmnumWfQX4Mh1gucB7s+6rFr1ZGBzQIyFrh m2uFWPyOj7ECifNinP93NZJbcA0cWjHVvI9dx2W6tC+06iJPaoseLD1Evj/6wjSZlSn4 2DVdJB9E5YJhKs+oLjsXMAqL3749zz7ryN+3Hg4XhJCk+5HYmjedeb2sp+8B1sBN0ey/ /qt0m9ayPB3IFJeMJ0lvqxOa2jvQvsDkVUYd8OV/vhs8H+Yz3Lurl8qGs7pLZSWDeVYy yYIrVJsnWRlADZGnVqqLF6GEPOuAAzxVoRD3T+YIjPc+hmoDkotzPDFb74QvLsOLwKKC 0NXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=UP6/BwARmVCHe5veMMBEuwbyPRE2FoJ2CvIlSIUomak=; b=BCiQwOpI7DIqeHopNtjkBEmXYa0fTYv2vLPKkDlDudjs+RsHR1J+kC2OkONfQDDayL Oaqkzzf4avkbWgcn8fbuMBp3KwLjx4rCBpNuqYQ3MkCGz7NPrHy4OijofqQ1qNxtYxb1 MUuG8vJbDb2phQu8Vg2utXnXXRX0TFnYX7d4hLm15FKPeDIRrNB/ZJCHUMY3oG15kh3M X8HyBSPeTAQXqlcSy5vs9vU9YTFpA16Qn8cUI6RdJQRenEXHP4FfVn3fdNlBDufuN1KJ lDM0Qv8bSHAbH35l3TIdXhgbEOMHguOU2A8ychKGd5dp2NJ0WBobsQuPXA/hKvsinR2g V1pA== 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=NONE sp=NONE dis=NONE) header.from=ispras.ru Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v8-20020a056402348800b0043a7b6f478fsi11049626edc.591.2022.07.23.12.55.44; Sat, 23 Jul 2022 12:56:09 -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=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233301AbiGWTbc (ORCPT + 99 others); Sat, 23 Jul 2022 15:31:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230005AbiGWTba (ORCPT ); Sat, 23 Jul 2022 15:31:30 -0400 Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B14E1CFCC for ; Sat, 23 Jul 2022 12:31:29 -0700 (PDT) Received: from hednb3.intra.ispras.ru (unknown [109.252.119.247]) by mail.ispras.ru (Postfix) with ESMTPSA id 9CA8D40737A5; Sat, 23 Jul 2022 19:31:25 +0000 (UTC) From: Alexey Khoroshilov To: Josh Poimboeuf , Peter Zijlstra , Borislav Petkov Cc: Alexey Khoroshilov , linux-kernel@vger.kernel.org, ldv-project@linuxtesting.org Subject: [PATCH] objtool,x86: Remove unneeded code in special_get_alts() Date: Sat, 23 Jul 2022 22:31:13 +0300 Message-Id: <1658604673-16080-1-git-send-email-khoroshilov@ispras.ru> X-Mailer: git-send-email 2.7.4 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS 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 Commit 134ab5bd1883 ("objtool,x86: Replace alternatives with .retpoline_sites") basically reverts commit 50e7b4a1a1b2 ("objtool: Skip magical retpoline .altinstr_replacement"), but it is an incomplete revert. As a result an unreachable code is left in special_get_alts() that was intended to skip magical special sections. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 134ab5bd1883 ("objtool,x86: Replace alternatives with .retpoline_sites") Signed-off-by: Alexey Khoroshilov --- tools/objtool/special.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/objtool/special.c b/tools/objtool/special.c index e2223dd91c37..6e84cb4d6774 100644 --- a/tools/objtool/special.c +++ b/tools/objtool/special.c @@ -168,8 +168,6 @@ int special_get_alts(struct elf *elf, struct list_head *alts) memset(alt, 0, sizeof(*alt)); ret = get_alt_entry(elf, entry, sec, idx, alt); - if (ret > 0) - continue; if (ret < 0) return ret; -- 2.7.4