From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37954)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <th.huth@gmail.com>) id 1eDmC4-00030b-V5
	for qemu-devel@nongnu.org; Sun, 12 Nov 2017 01:56:38 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <th.huth@gmail.com>) id 1eDmC1-0006pY-T0
	for qemu-devel@nongnu.org; Sun, 12 Nov 2017 01:56:37 -0500
Received: from mail-wm0-f68.google.com ([74.125.82.68]:55487)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <th.huth@gmail.com>) id 1eDmC1-0006p3-MW
	for qemu-devel@nongnu.org; Sun, 12 Nov 2017 01:56:33 -0500
Received: by mail-wm0-f68.google.com with SMTP id 9so3948110wme.4
	for <qemu-devel@nongnu.org>; Sat, 11 Nov 2017 22:56:33 -0800 (PST)
Date: Sun, 12 Nov 2017 07:56:27 +0100
From: Thomas Huth <huth@tuxfamily.org>
Message-ID: <20171112075627.5798b8b9@thl530.multi.box>
In-Reply-To: <20171110194935.17541-1-laurent@vivier.eu>
References: <20171110194935.17541-1-laurent@vivier.eu>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] linux-user,
 s390x: ignore OS ABI value in ELF header
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Laurent Vivier <laurent@vivier.eu>
Cc: qemu-devel@nongnu.org, Richard Henderson <rth@twiddle.net>, Peter Maydell <peter.maydell@linaro.org>

Am Fri, 10 Nov 2017 20:49:35 +0100
schrieb Laurent Vivier <laurent@vivier.eu>:

> I have this error:
> bash: /sbin/ldconfig: cannot execute binary file: Exec format error
> 
> because /sbin/ldconfig is:
> ELF 64-bit MSB executable, IBM S/390, version 1 (GNU/Linux),
> statically linked, for GNU/Linux 3.2.0,
> BuildID[sha1]=90b64604014aafac9c1a0623b1cf447281d1a382, stripped
> 
> OS ABI is GNU/linux
> 
> "/bin/ls" works well:
> 
> ELF 64-bit MSB shared object, IBM S/390, version 1 (SYSV),
> dynamically linked, interpreter /lib/ld64.so.1, for GNU/Linux 3.2.0,
> BuildID[sha1]=be9b19143d4657678846f6e5277383071fc1059a, stripped
> 
> OS ABI is SYSV
> 
> To be able to execute ldconfig, this patch modifies s390x binfmt mask
> to ignore the OS ABI value (EI_OSABI, byte 7).
> 
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  scripts/qemu-binfmt-conf.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
> index 8afc3eb5bb..e2e1b7544d 100755
> --- a/scripts/qemu-binfmt-conf.sh
> +++ b/scripts/qemu-binfmt-conf.sh
> @@ -85,7 +85,7 @@
> sh4eb_mask='\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff
> sh4eb_family=sh4 
>  s390x_magic='\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16'
> -s390x_mask='\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
> +s390x_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'

If I've got that right, the OSABI field should either be 0 for
"No extensions or unspecified" (which is then printed  by "file"
as SYSV) or 3 for "GNU/Linux".
Thus wouldn't it be better to use a mask of 0xfc here instead, so
that we refuse at least everything with a value > 3 here?

Also I wonder whether i386 has the same problem, too?

 Thomas