 @@ -1,14 +1,14 @@
-/*	$NetBSD: exec_elf.c,v 1.69.2.2 2015/03/29 09:07:55 martin Exp $	*/
+/*	$NetBSD: exec_elf.c,v 1.69.2.3 2015/11/08 00:57:09 riz Exp $	*/
 /*-
  * Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -47,27 +47,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.69.2.2 2015/03/29 09:07:55 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.69.2.3 2015/11/08 00:57:09 riz Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_pax.h"
 #endif /* _KERNEL_OPT */
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/kmem.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
 #include <sys/syscall.h>
 @@ -929,33 +929,40 @@ netbsd_elf_signature(struct lwp *l, stru
 		case ELF_NOTE_TYPE_NETBSD_TAG:
 			/* It is us */
 			if (np->n_namesz == ELF_NOTE_NETBSD_NAMESZ &&
 			    np->n_descsz == ELF_NOTE_NETBSD_DESCSZ &&
 			    memcmp(ndata, ELF_NOTE_NETBSD_NAME,
 			    ELF_NOTE_NETBSD_NAMESZ) == 0) {
 				memcpy(&epp->ep_osversion, ndesc,
 				    ELF_NOTE_NETBSD_DESCSZ);
 				isnetbsd = 1;
 				break;
+			}
 			/*
-			 * Ignore SuSE tags; SuSE's n_type is the same as NetBSD's
+			 * Ignore SuSE tags; SuSE's n_type is the same the
-			 * one.
+			 * NetBSD one.
 			 */
 			if (np->n_namesz == ELF_NOTE_SUSE_NAMESZ &&
 			    memcmp(ndata, ELF_NOTE_SUSE_NAME,
 			    ELF_NOTE_SUSE_NAMESZ) == 0)
 				break;
 			/*
 			 * Ignore old GCC
 			 */
 			if (np->n_namesz == ELF_NOTE_OGCC_NAMESZ &&
 			    memcmp(ndata, ELF_NOTE_OGCC_NAME,
 			    ELF_NOTE_OGCC_NAMESZ) == 0)
 				break;
 			BADNOTE("NetBSD tag");
 			goto bad;
 		case ELF_NOTE_TYPE_PAX_TAG:
 			if (np->n_namesz == ELF_NOTE_PAX_NAMESZ &&
 			    np->n_descsz == ELF_NOTE_PAX_DESCSZ &&
 			    memcmp(ndata, ELF_NOTE_PAX_NAME,
 			    ELF_NOTE_PAX_NAMESZ) == 0) {
 				memcpy(&epp->ep_pax_flags, ndesc,
 				    sizeof(epp->ep_pax_flags));
 				break;
+			}
 			BADNOTE("PaX tag");
 @@ -994,26 +1001,29 @@ netbsd_elf_signature(struct lwp *l, stru
 			    && memcmp(ndata, ELF_NOTE_MCMODEL_NAME,
 				    ELF_NOTE_MCMODEL_NAMESZ) == 0) {
 				ELF_MD_MCMODEL_CHECK(epp, ndesc, np->n_descsz);
 				break;
+			}
 			BADNOTE("mcmodel tag");
 			goto bad;
 #endif
 			break;
 		case ELF_NOTE_TYPE_SUSE_VERSION_TAG:
 			break;
 		case ELF_NOTE_TYPE_GO_BUILDID_TAG:
 			break;
 		default:
 			BADNOTE("unknown tag");
 bad:
 #ifdef DIAGNOSTIC
 			/* Ignore GNU tags */
 			if (np->n_namesz == ELF_NOTE_GNU_NAMESZ &&
 			    memcmp(ndata, ELF_NOTE_GNU_NAME,
 			    ELF_NOTE_GNU_NAMESZ) == 0)
 			    break;
 			int ns = MIN(np->n_namesz, shp->sh_size - sizeof(*np));
 			printf("%s: Unknown elf note type %d (%s): "
 			    "[namesz=%d, descsz=%d name=%-*.*s]\n",

 @@ -1,14 +1,14 @@
-/*	$NetBSD: exec_elf.h,v 1.141 2014/07/08 17:16:25 maxv Exp $	*/
+/*	$NetBSD: exec_elf.h,v 1.141.2.1 2015/11/08 00:57:09 riz Exp $	*/
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -812,26 +812,31 @@ typedef struct {
  */
 /* GNU-specific note name and description sizes */
 #define ELF_NOTE_TYPE_ABI_TAG		1
 #define ELF_NOTE_ABI_NAME		ELF_NOTE_GNU_NAME
 #define ELF_NOTE_ABI_NAMESZ		ELF_NOTE_GNU_NAMESZ
 #define ELF_NOTE_ABI_DESCSZ		16
 /* GNU-specific OS/version value stuff */
 #define ELF_NOTE_ABI_OS_LINUX		0
 #define ELF_NOTE_ABI_OS_HURD		1
 #define ELF_NOTE_ABI_OS_SOLARIS		2
 #define ELF_NOTE_ABI_OS_KFREEBSD	3
 #define ELF_NOTE_ABI_OS_KNETBSD		4
 /* Old gcc style, under the ABI tag */
 #define ELF_NOTE_OGCC_NAMESZ		8
 #define ELF_NOTE_OGCC_NAME		"01.01\0\0\0\0"
 #define ELF_NOTE_OGCC_DESCSZ		0
 /*
  * GNU-specific note type: Hardware capabilities
  * name: GNU\0
  * namesz: 4
  * desc:
  *	word[0]: Number of entries
  *	word[1]: Bitmask of enabled entries
  *	Followed by a byte id, and a NUL terminated string per entry
  * descsz: variable
  */
 #define ELF_NOTE_TYPE_GNU_HWCAP		2
 /*
 @@ -871,26 +876,38 @@ typedef struct {
  *	V = version of following data
  *	T = product type: [box, sles, nld, whatever]
  *	M = product major version
  *	m = product minor version
  * descsz: 8
  */
 #define ELF_NOTE_TYPE_SUSE_VERSION_TAG	0x45537553	/* SuSE in LE */
 /* SuSE-specific note name and description sizes */
 #define ELF_NOTE_SUSE_VERSION_NAMESZ	8
 #define ELF_NOTE_SUSE_VERSION_DESCSZ	8
 /* SuSE-specific note name */
 #define ELF_NOTE_SUSE_VERSION_NAME		"SuSE\0\0\0\0"
 /* Go-specific note type: buildid
  * name: Go\0\0
  * namesz: 4
  * desc:
  *	words[10]
  * descsz: 40
  */
 #define ELF_NOTE_TYPE_GO_BUILDID_TAG	4
 #define ELF_NOTE_GO_BUILDID_NAMESZ	4
 #define ELF_NOTE_GO_BUILDID_DESCSZ	40
 #define ELF_NOTE_GO_BUILDID_NAME	"Go\0\0"
 /* NetBSD-specific note type: Emulation name.
  * name: NetBSD\0\0
  * namesz: 8
  * desc:
  *	word[0]: MMmmrrpp00
+ *
  *	M = major version
  *	m = minor version
  *	r = release ["",A-Z,Z[A-Z] but numeric]
  *	p = patchlevel
  * descsz: 4
  */
 #define ELF_NOTE_TYPE_NETBSD_TAG	1