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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 157ADC10F0E for ; Sun, 7 Apr 2019 19:11:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DAC1C20880 for ; Sun, 7 Apr 2019 19:11:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cQSoEwtE"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="VvHnuzL8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DAC1C20880 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=QdptESsz0OjTyM+8jC4XGGTThSZ1/qlTNc8fK2G1Zbk=; b=cQSoEwtEytSTlQ s6Rlp/tDar5AK+s7YgjLOT4cu2erzhboBV4OoVF6Kf0EWxxkmjQxATY0V0WvsvDcUvAqRwurGXP2y bKDuCalTNrHJmf4BjYjY+yEGz4Yh57dAFUr6t9xtxbQtQZc/ZRE3NxZ/CAdYmbwhLO4n4o5XwzTtT BDZEZ+nbYn7JWxXWV55Eyzh2jZUS+aNNVwZe0k/jlVZNvMixOgV68brBtZTdpIbzo83DcXt7xPOUH aWH9Hif4L2m17VKfOwctfMHwK1R7zo06f6bGKMURCmOSk8CH39vakWFTl6JeEa0L89k/QqDk02xHK i8gNP9YJ58yTyrC/aR7A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDDCp-0002qx-67; Sun, 07 Apr 2019 19:11:51 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDDCm-0002qa-GV for linux-arm-kernel@lists.infradead.org; Sun, 07 Apr 2019 19:11:49 +0000 Received: by mail-wm1-x341.google.com with SMTP id a184so11825258wma.2 for ; Sun, 07 Apr 2019 12:11:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5lYFX6X0Wq3dfqeJgMQPZrQRNWeMV7KWaYIcX0QVxO0=; b=VvHnuzL8r4yShAUIzS5kliOtvZlkphAjCTbpCLbWKivFp7+PMpFqpfB8SlWO2ZszS8 c2LQRcxxrtrxqZ9xHRbtkr9VryOXTNNeedAcw9deCpdDCwzKqnep3E9fzadc821LUBoX jkpMdhIQAkjgPAJQjjHgDvZsMxNX599CYxILAsXxdMMTg5tR6Ak+GSaG0Hk/j74lq42l gsWOnAve2nsfZYuPc1UqlCPhjyGv4h60wXkjzIl17SmJHotzHCxxd1Eg7H25FBTrpciB SjXBs1awlP5PmKmKz5KnnEGw6/DQWXGuDuCcQm+FufOnxviCwbpCeey7j64gElihU2Y2 6AdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5lYFX6X0Wq3dfqeJgMQPZrQRNWeMV7KWaYIcX0QVxO0=; b=NspgEhJ1yEM61oI7bD0SEhZrNpO/aRv28Ut2+QBmuGPyk+H1uxpV/48DjthIE1YSaV tXu7UTnVZAOzJD9BfUN7EwDMaEHrQS7J+dv9cj0DCqVZjg813dW6+RIja/ELHmpCc2D1 kV4alxnAcnW+p0ABcJtR+0/jjsT0BkBO6ObTj4gbw3fuykgTTvQkGruNvCN5Qbg7APo6 ROpoaM91PKk4YBBSXtvejpR/1KwyA26tnFpqJAeieTZlRMiYsHyvmOuMG6Drrljp0Hjs 7aNWgv3Diu2jNStDWBrajZVzYibcftuEBwFvzXIxHfgiXw6Azy+r0OM6WNIncf6t/bhM n1wQ== X-Gm-Message-State: APjAAAXkOaQ3x23HFVd6KuCrsbpvxQL7SSDH7CgGvPCJ34k+uDjbTDyr D3OlpYT1D5FX5tLiIjSXj7okizGltReOIA== X-Google-Smtp-Source: APXvYqwti1saTU0s9b290Av11JAFA2uLXTtCM79eb6UH6DJJJznNf864v/A5P1/u5hXJ4y2sH3rGow== X-Received: by 2002:a7b:ce84:: with SMTP id q4mr2588756wmj.41.1554664304974; Sun, 07 Apr 2019 12:11:44 -0700 (PDT) Received: from sudo.home ([2a01:cb1d:112:6f00:a44b:80b5:b39a:5a82]) by smtp.gmail.com with ESMTPSA id u8sm27183487wrt.69.2019.04.07.12.11.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Apr 2019 12:11:43 -0700 (PDT) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm64/ftrace: fix inadvertent BUG() in trampoline check Date: Sun, 7 Apr 2019 21:06:16 +0200 Message-Id: <20190407190616.30436-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190407_121148_553088_27335C75 X-CRM114-Status: GOOD ( 13.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: duwe@lst.de, catalin.marinas@arm.com, Ard Biesheuvel , will.deacon@arm.com, dann.frazier@canonical.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org The ftrace trampoline code (which deals with modules loaded out of BL range of the core kernel) uses plt_entries_equal() to check whether the per-module trampoline equals a zero buffer, to decide whether the trampoline has already been initialized. This triggers a BUG() in the opcode manipulation code, since we end up checking the ADRP offset of a 0x0 opcode, which is not an ADRP instruction. So instead, add a helper to check whether a PLT is initialized, and call that from the frace code. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/module.h | 5 +++++ arch/arm64/kernel/ftrace.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/module.h b/arch/arm64/include/asm/module.h index 905e1bb0e7bd..cd9f4e9d04d3 100644 --- a/arch/arm64/include/asm/module.h +++ b/arch/arm64/include/asm/module.h @@ -73,4 +73,9 @@ static inline bool is_forbidden_offset_for_adrp(void *place) struct plt_entry get_plt_entry(u64 dst, void *pc); bool plt_entries_equal(const struct plt_entry *a, const struct plt_entry *b); +static inline bool plt_entry_is_initialized(const struct plt_entry *e) +{ + return e->adrp || e->add || e->br; +} + #endif /* __ASM_MODULE_H */ diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c index 8e4431a8821f..07b298120182 100644 --- a/arch/arm64/kernel/ftrace.c +++ b/arch/arm64/kernel/ftrace.c @@ -107,8 +107,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) trampoline = get_plt_entry(addr, mod->arch.ftrace_trampoline); if (!plt_entries_equal(mod->arch.ftrace_trampoline, &trampoline)) { - if (!plt_entries_equal(mod->arch.ftrace_trampoline, - &(struct plt_entry){})) { + if (plt_entry_is_initialized(mod->arch.ftrace_trampoline)) { pr_err("ftrace: far branches to multiple entry points unsupported inside a single module\n"); return -EINVAL; } -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel