From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752570AbcGXPbW (ORCPT ); Sun, 24 Jul 2016 11:31:22 -0400 Received: from alt42.smtp-out.videotron.ca ([23.233.128.29]:31714 "EHLO alt42.smtp-out.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752037AbcGXPak (ORCPT ); Sun, 24 Jul 2016 11:30:40 -0400 X-Authority-Analysis: v=2.1 cv=YqOvP9sX c=1 sm=1 tr=0 a=keA3yYpnlypCNW5BNWqu+w==:117 a=keA3yYpnlypCNW5BNWqu+w==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=cAmyUtKerLwA:10 a=KKAkSRfTAAAA:8 a=lE0LptPQsfaGjRLw4EQA:9 a=cvBusfyB2V15izCimMoJ:22 From: Nicolas Pitre To: Greg Ungerer , linux-fsdevel@vger.kernel.org Cc: Alan Cox , Alexander Viro , David Howells , linux-arm-kernel@lists.infradead.org, linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 15/15] ARM: enable binfmt_flat on systems with an MMU Date: Sun, 24 Jul 2016 11:30:29 -0400 Message-Id: <1469374229-21585-16-git-send-email-nicolas.pitre@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469374229-21585-1-git-send-email-nicolas.pitre@linaro.org> References: <1469374229-21585-1-git-send-email-nicolas.pitre@linaro.org> X-CMAE-Envelope: MS4wfEjvpoCpne2zWvJce1F/gU0ckvKzRMg8H9NdepJm/J6WJi+F249R02RgsnF3e7JcVVXvi0e81Sc5CHqrzr/34r3ZvZgGGcW9fcuYpiKVW7AjoQ6jQ8YY iX01gyMN4Di282xbkEuFBADISL1Q5xswjARQIckh9pmKlp08h6rW63MC1hS4qQmiBHzoLLh+9gGanjwPGx2VvL1eSSZbbrgiSX4bk5xK4dNkLNLEAYK7LtoO IAEPDNYyYElpzQ51zA/6FKr+l26KhAJWkqMKBx3rDF7Phzfc4n1s29rhyjv3xoCqXLCWmJTSVGQkvwohehDKi5ZWK5JyBGwhvnsRib66nTkz1rnRrC6B74tq 3NEWHUEVsy/iRgI3T2Z5ZlP/yRek/oRgpfAyOKE45tWJMMb1xjxHp8JyvNWBd8hkO2ZHr6QfSbRD0jlYyRkd0jH2hBJS8b76Ga9IwsT7faF0iZiucmE= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the generic changes are in place, this can be enabled on ARM with the use of proper user space accessors in the flat_get_addr_from_rp() and flat_put_addr_at_rp() handlers as rp actually holds a user space address. Signed-off-by: Nicolas Pitre --- arch/arm/include/asm/flat.h | 5 +++-- fs/Kconfig.binfmt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/flat.h b/arch/arm/include/asm/flat.h index e847d23351..acf1d14b89 100644 --- a/arch/arm/include/asm/flat.h +++ b/arch/arm/include/asm/flat.h @@ -8,8 +8,9 @@ #define flat_argvp_envp_on_stack() 1 #define flat_old_ram_flag(flags) (flags) #define flat_reloc_valid(reloc, size) ((reloc) <= (size)) -#define flat_get_addr_from_rp(rp, relval, flags, persistent) ((void)persistent,get_unaligned(rp)) -#define flat_put_addr_at_rp(rp, val, relval) put_unaligned(val,rp) +#define flat_get_addr_from_rp(rp, relval, flags, persistent) \ + ({ unsigned long __val; __get_user_unaligned(__val, rp); __val; }) +#define flat_put_addr_at_rp(rp, val, relval) __put_user_unaligned(val, rp) #define flat_get_relocate_addr(rel) (rel) #define flat_set_persistent(relval, p) 0 diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt index c7efddf6e0..4c09d93d95 100644 --- a/fs/Kconfig.binfmt +++ b/fs/Kconfig.binfmt @@ -89,7 +89,7 @@ config BINFMT_SCRIPT config BINFMT_FLAT bool "Kernel support for flat binaries" - depends on !MMU || M68K + depends on !MMU || ARM || M68K depends on !FRV || BROKEN help Support uClinux FLAT format binaries. -- 2.7.4