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.
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to