Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp773703ybt; Fri, 19 Jun 2020 13:24:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9D3WBYt0ePDgE1xw+VfXOUsb8/9qdAeOVHXm8epmt8upOcvZ4BNBdj1Gq70+WRA9i7eCd X-Received: by 2002:aa7:d9c6:: with SMTP id v6mr5116036eds.29.1592598296049; Fri, 19 Jun 2020 13:24:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592598296; cv=none; d=google.com; s=arc-20160816; b=Qq+mYKpeqYmhFW3+YnD4j2BJL3BmQizqJ0zqsnGFkViduxCaqwhvcwYsuKOfcssBiJ MsOCOpBeSK5ww66lWN8S2W3gd2CAXHfT+K0mP9aMMWWGcsNctms9CbNtoxkRBzbaWAcX 4+t9A/bID90j3DhNzThGK0ToPWxcOl8un+D8NJSTYI4oFFtAPnIychOZf84Wn3cxjnE/ jMjO8IVMsUPvJVA65LSiScjqBxkveIjCb4CSO7bcyVaD3pO0LuDsOkJuJxIXADJgjmhV Q1d2q31I645xEmJGNf8z5EFXSZDD71NshHFrjHRNLfQAJNJS6oUadyzbPqVIHYD/7K3q guzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fhviafa60ynnKX5W5yS3oZQHdzvzVKW8epPRzD74JkE=; b=tHj+khPS1SXQ9gr4m7hzItCCSxVNa/ErcK8P8SMvHNZ+S/vqO8YnuxWJGHY5px7bDs tEw1+dEWOqQDxEsTo4EXS695XSeKy70OsBna4TuBfXWKmVKfCWAj5/LLRCaUL0e4wYHi Kh9wXXGVjivge8S//V7fEFT5gDeOH4Njvbr8wZCHRRkkXzne1d+O4AydPt12WFltbsCG gWe4W2Xgh0grDLvs/queVl5+VnEPTulrkR6Aqg4dSnuBYOfDnnGcN8e3p/MAiKWqxmDC Ez76Jau/x6zpN5NF2c7TwhtR3vUF7iNyhTu03cH2K+9aqiRCRO1CizeNWl+zkoplXjPH 1h5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=P3jS9FTb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dp14si5680013ejc.412.2020.06.19.13.24.33; Fri, 19 Jun 2020 13:24:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=P3jS9FTb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388467AbgFSOsf (ORCPT + 99 others); Fri, 19 Jun 2020 10:48:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:40462 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389060AbgFSOsN (ORCPT ); Fri, 19 Jun 2020 10:48:13 -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 B4D9E2083B; Fri, 19 Jun 2020 14:48:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592578093; bh=xaKaHoYc/W9XElwQ0MqMdSYCMVYe5Jt6cQyWuW9Y+lQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P3jS9FTb96dCAiYWWDhOMnw7Jwd9FH5HEwQrW1bC+dpTSxUlMgjubUUxJj/tYmXdN MjXTh95lbBOnH5GYqOfv42FpSSCvq+UWaYna9qB9AhdlSSZEc8jwfmDRSBpDofJ0tj 1+T3QOwUmYxhnWaczdSzPVl0t8dSlFGAAaXwXPts= 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.14 079/190] objtool: Ignore empty alternatives Date: Fri, 19 Jun 2020 16:32:04 +0200 Message-Id: <20200619141637.534899943@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141633.446429600@linuxfoundation.org> References: <20200619141633.446429600@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 5685fe2c7a7d..247fbb5f6a38 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -778,6 +778,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