From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72E24C433DF for ; Fri, 19 Jun 2020 14:57:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4AA9921927 for ; Fri, 19 Jun 2020 14:57:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592578656; bh=/YEJX4/4794rBMCNqysDhVlcMXdUFlMmWWEnYdEx+MU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Y8pBHQsVFfv7UZGZgHUkZ0ySeC9B7sSnDneAo05SGw5gxXH49wA8VYmfVG+3V/lnM 1dCALiwd8BvHinEsKNf0vx7qqSzKIV/y0kdoiddA6VW5Jw+wBrDHW3MF1nifBZZ2+w iek2psrzyKPIiViar6fyBFf0704u1p2GXz5X3/b4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390262AbgFSO5e (ORCPT ); Fri, 19 Jun 2020 10:57:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:52496 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390193AbgFSO5M (ORCPT ); Fri, 19 Jun 2020 10:57:12 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 49612217D8; Fri, 19 Jun 2020 14:57:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592578632; bh=/YEJX4/4794rBMCNqysDhVlcMXdUFlMmWWEnYdEx+MU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wmjujtVmMnqNCfhQQSO1HwgOTcn38XYeDd9pmpUEn3xFIG7NJ9WYB8XMqiCnxXA/m R8SPerNCxD4OjUOoNofvDOZm3jBGdkuHYXQ7oZ5O30TvihxFYNxX3VDJh0cebf3MKl +xhrZaTUdri8in7XVr4AK+ZQv7dIo40uoU9/P//M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Julien Thierry , "Peter Zijlstra (Intel)" , Miroslav Benes , Josh Poimboeuf , Ingo Molnar , Sasha Levin Subject: [PATCH 4.19 097/267] objtool: Ignore empty alternatives Date: Fri, 19 Jun 2020 16:31:22 +0200 Message-Id: <20200619141653.514213479@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141648.840376470@linuxfoundation.org> References: <20200619141648.840376470@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Julien Thierry [ Upstream commit 7170cf47d16f1ba29eca07fd818870b7af0a93a5 ] The .alternatives section can contain entries with no original instructions. Objtool will currently crash when handling such an entry. Just skip that entry, but still give a warning to discourage useless entries. Signed-off-by: Julien Thierry Acked-by: Peter Zijlstra (Intel) Reviewed-by: Miroslav Benes Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- tools/objtool/check.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 4d509734b695..fd3071d83dea 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -801,6 +801,12 @@ static int add_special_section_alts(struct objtool_file *file) } if (special_alt->group) { + if (!special_alt->orig_len) { + WARN_FUNC("empty alternative entry", + orig_insn->sec, orig_insn->offset); + continue; + } + ret = handle_group_alt(file, special_alt, orig_insn, &new_insn); if (ret) -- 2.25.1