From owner-svn-src-head@freebsd.org  Thu Mar 23 12:25:27 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84925D18E21;
 Thu, 23 Mar 2017 12:25:27 +0000 (UTC)
 (envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F090811A0;
 Thu, 23 Mar 2017 12:25:26 +0000 (UTC)
 (envelope-from kostikbel@gmail.com)
Received: from tom.home (kib@localhost [127.0.0.1])
 by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id v2NCPLg6066677
 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
 Thu, 23 Mar 2017 14:25:21 +0200 (EET)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua v2NCPLg6066677
Received: (from kostik@localhost)
 by tom.home (8.15.2/8.15.2/Submit) id v2NCPLFG066667;
 Thu, 23 Mar 2017 14:25:21 +0200 (EET)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Thu, 23 Mar 2017 14:25:21 +0200
From: Konstantin Belousov <kostikbel@gmail.com>
To: Ed Schouten <ed@nuxi.nl>
Cc: Ed Schouten <ed@freebsd.org>, src-committers <src-committers@freebsd.org>, 
 svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject: Re: svn commit: r315701 - in head/sys: amd64/cloudabi32
 amd64/cloudabi64 arm/cloudabi32 arm64/cloudabi64 i386/cloudabi32
Message-ID: <20170323122521.GA43712@kib.kiev.ua>
References: <201703220705.v2M75RHE066483@repo.freebsd.org>
 <20170322090258.GR43712@kib.kiev.ua>
 <CABh_MKmEMidUHFXw1fpwb8TP7qEktnFPgXH4UUvmu2bmhdgiqA@mail.gmail.com>
 <20170322230026.GV43712@kib.kiev.ua>
 <CABh_MK=Gge1oSJ9ERvvNCeEW2F6omLiLAVqEYQ1sdG5oVoVZVg@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CABh_MK=Gge1oSJ9ERvvNCeEW2F6omLiLAVqEYQ1sdG5oVoVZVg@mail.gmail.com>
User-Agent: Mutt/1.8.0 (2017-02-23)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
 autolearn_force=no version=3.4.1
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Mar 2017 12:25:27 -0000

On Thu, Mar 23, 2017 at 08:43:20AM +0100, Ed Schouten wrote:
> Thanks! I just gave the patch a try, but the comparison added to
> imgact_elf.c now causes the brandinfo to be skipped entirely. Attached
> is a patch that does work for me.
> 
> Index: sys/kern/imgact_elf.c
> ===================================================================
> --- sys/kern/imgact_elf.c	(revision 315828)
> +++ sys/kern/imgact_elf.c	(working copy)
> @@ -312,8 +312,9 @@
>  			continue;
>  		if (hdr->e_machine == bi->machine &&
>  		    (hdr->e_ident[EI_OSABI] == bi->brand ||
> +		    (bi->compat_3_brand != NULL &&
>  		    strcmp((const char *)&hdr->e_ident[OLD_EI_BRAND],
> -		    bi->compat_3_brand) == 0)) {
> +		    bi->compat_3_brand) == 0))) {
>  			/* Looks good, but give brand a chance to veto */
>  			if (!bi->header_supported ||
>  			    bi->header_supported(imgp)) {

This looks fine, please commit.