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=-12.8 required=3.0 tests=BAYES_00,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 0CA46C43467 for ; Fri, 16 Oct 2020 09:09:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B038720EDD for ; Fri, 16 Oct 2020 09:09:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602839376; bh=+e/uitgR3t1bG0EJ3BLVPobcveEUtzgsLVdE9SoF+5M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kEqoWgZ3VwuumfgZDHGIhip6dv9tzYTY05wXw3iwu8jy1zAW0p5SFvJpXkYBe8Kvq +XUmdM3mBE3g2GH13uvxm6bfPgMQYzUyxlUNmCnj84kkGuPqGLemS0focHOws/kQSN afi7vgJ09IMPPafWibsPH2puPuVg5GicXaDSwYh8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405565AbgJPJJf (ORCPT ); Fri, 16 Oct 2020 05:09:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:37980 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395007AbgJPJJR (ORCPT ); Fri, 16 Oct 2020 05:09:17 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 B96AA21556; Fri, 16 Oct 2020 09:09:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602839356; bh=+e/uitgR3t1bG0EJ3BLVPobcveEUtzgsLVdE9SoF+5M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EPA0U57ZMENhdRorNhgHX5EpSiy5HHkIHj3rFQqo9YW2TGz+aoWSLWkaq/3OYIpMU LIeDo+I1mZJ1oqUqosOfaOg9P6hL3w4942dTJQBXJwIVH7vw5Fla9SjBJi+nA6Tnit 7IvFZ/gMe05diCI18baV5FsnzXiReRaSOG6gZ+MQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Jason A. Donenfeld" , Masahiro Yamada , Arnd Bergmann , Ard Biesheuvel , Russell King , Sasha Levin Subject: [PATCH 4.19 04/21] ARM: 8867/1: vdso: pass --be8 to linker if necessary Date: Fri, 16 Oct 2020 11:07:23 +0200 Message-Id: <20201016090437.519246900@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201016090437.301376476@linuxfoundation.org> References: <20201016090437.301376476@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jason A. Donenfeld [ Upstream commit c5d0e49e8d8f1a23034fdf8e935afc0c8f7ae27d ] The commit fe00e50b2db8 ("ARM: 8858/1: vdso: use $(LD) instead of $(CC) to link VDSO") removed the passing of CFLAGS, since ld doesn't take those directly. However, prior, big-endian ARM was relying on gcc to translate its -mbe8 option into ld's --be8 option. Lacking this, ld generated be32 code, making the VDSO generate SIGILL when called by userspace. This commit passes --be8 if CONFIG_CPU_ENDIAN_BE8 is enabled. Signed-off-by: Jason A. Donenfeld Cc: Masahiro Yamada Cc: Arnd Bergmann Cc: Ard Biesheuvel Signed-off-by: Russell King Signed-off-by: Sasha Levin --- arch/arm/vdso/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/vdso/Makefile b/arch/arm/vdso/Makefile index fadf554d93917..1f5ec9741e6d4 100644 --- a/arch/arm/vdso/Makefile +++ b/arch/arm/vdso/Makefile @@ -10,9 +10,10 @@ obj-vdso := $(addprefix $(obj)/, $(obj-vdso)) ccflags-y := -fPIC -fno-common -fno-builtin -fno-stack-protector ccflags-y += -DDISABLE_BRANCH_PROFILING -ldflags-y = -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \ +ldflags-$(CONFIG_CPU_ENDIAN_BE8) := --be8 +ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \ -z max-page-size=4096 -z common-page-size=4096 \ - -nostdlib -shared \ + -nostdlib -shared $(ldflags-y) \ $(call ld-option, --hash-style=sysv) \ $(call ld-option, --build-id) \ -T -- 2.25.1