From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZrzyRg7Erl1TaUbGnmwvOg/kp2MqMZeklTgvdCdTaTGFGdqijroyx08M7/haUA8hYXHYOj6 ARC-Seal: i=1; a=rsa-sha256; t=1524837685; cv=none; d=google.com; s=arc-20160816; b=PVBi4aj1UzRoeGk0ls11FdvE0OVPabu+kmlTr2oROilJpmHasqpCCca7yObYvbw1BX Pg/wLBSYzuxc3OJKh4CpgJYeo79ZsGTKfeZdf5AJfV/3ZiKqBWR7pXbiu28/PFKVSwE8 WJO4OXxIbELwPJFJBr2b760nBpbZivNb5bgjgbCJLQzlpgsGhRg0s1wxKN2IlqN1TNIt HRAZqlfeSQLGpxjepp2zJP7uUT7LWKqXkH0lQ22NuADqsorpRcCSI2racLrdaqwxjzaQ u8T4rjJIDNnEiyD8iD3DeAIuNIhGoNe6GqCTvAqbk/LsdZGapgKGR1VW5qHjtd5+VQ9N nv3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dmarc-filter:arc-authentication-results; bh=WTELh7axtk6+7Kwtnak98WFyH9/zB/p28tZrNIR/Ht8=; b=oBEdK+1c60D3kzFLviV4PLremFkrdec2A/H5uo0iqaqcAl7BmDO3SQDNcJS+tGEozM rFC2ONoscyJzeDF12KyMdwECZjsnMj/IZ7oV0oq6TNF89gqGbhedLVYokAPvnaydMPy5 sUfq6o0tVSooGrMJ5z/Ap3Cceni3bTneH+Ze9eZczmMnrWXwG85DqrkCUs8GbGk/FB+H wAPO2ZqVGRKOzJ6ugbPmPGLjs2OT9HebkGswpqReE9ZAl/DmVRFJle7zOf7nIIoOs0EZ 0SeTtTq8ZmwDdBod2FCua8rFiGwRnpYYO3zhTop5OF0e0NuoMBz01bRBjiS4WFYmy6qH gidw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of srs0=4/0d=hq=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=4/0d=HQ=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of srs0=4/0d=hq=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=4/0d=HQ=linuxfoundation.org=gregkh@kernel.org DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3044C21890 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=fail smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Martin Schwidefsky Subject: [PATCH 4.4 27/50] s390: correct module section names for expoline code revert Date: Fri, 27 Apr 2018 15:58:29 +0200 Message-Id: <20180427135657.301089021@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180427135655.623669681@linuxfoundation.org> References: <20180427135655.623669681@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1598908200609195840?= X-GMAIL-MSGID: =?utf-8?q?1598908200609195840?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Martin Schwidefsky [ Upstream commit 6cf09958f32b9667bb3ebadf74367c791112771b ] The main linker script vmlinux.lds.S for the kernel image merges the expoline code patch tables into two section ".nospec_call_table" and ".nospec_return_table". This is *not* done for the modules, there the sections retain their original names as generated by gcc: ".s390_indirect_call", ".s390_return_mem" and ".s390_return_reg". The module_finalize code has to check for the compiler generated section names, otherwise no code patching is done. This slows down the module code in case of "spectre_v2=off". Cc: stable@vger.kernel.org # 4.16 Fixes: f19fbd5ed6 ("s390: introduce execute-trampolines for branches") Signed-off-by: Martin Schwidefsky Signed-off-by: Greg Kroah-Hartman --- arch/s390/kernel/module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/s390/kernel/module.c +++ b/arch/s390/kernel/module.c @@ -473,11 +473,11 @@ int module_finalize(const Elf_Ehdr *hdr, apply_alternatives(aseg, aseg + s->sh_size); if (IS_ENABLED(CONFIG_EXPOLINE) && - (!strcmp(".nospec_call_table", secname))) + (!strncmp(".s390_indirect", secname, 14))) nospec_revert(aseg, aseg + s->sh_size); if (IS_ENABLED(CONFIG_EXPOLINE) && - (!strcmp(".nospec_return_table", secname))) + (!strncmp(".s390_return", secname, 12))) nospec_revert(aseg, aseg + s->sh_size); }