svn commit: r292886 - in user/ngie/stable-10-libnv: . sys/fs/devfs sys/kern usr.sbin/crunch/crunchide

[Garrett Cooper]

Author: ngie
Date: Tue Dec 29 20:42:42 2015
New Revision: 292886
URL: https://svnweb.freebsd.org/changeset/base/292886

Log:
  MFstable/10 @ r292885

Added:
  user/ngie/stable-10-libnv/.arcconfig
     - copied unchanged from r292885, stable/10/.arcconfig
  user/ngie/stable-10-libnv/.arclint
     - copied unchanged from r292885, stable/10/.arclint
Modified:
  user/ngie/stable-10-libnv/sys/fs/devfs/devfs_vnops.c
  user/ngie/stable-10-libnv/sys/kern/imgact_elf.c
  user/ngie/stable-10-libnv/usr.sbin/crunch/crunchide/exec_elf32.c
Directory Properties:
  user/ngie/stable-10-libnv/   (props changed)

Copied: user/ngie/stable-10-libnv/.arcconfig (from r292885, stable/10/.arcconfig)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ngie/stable-10-libnv/.arcconfig	Tue Dec 29 20:42:42 2015	(r292886, copy of r292885, stable/10/.arcconfig)
@@ -0,0 +1,6 @@
+{
+	"project.name": "S",
+	"repository.callsign" : "S",
+	"phabricator.uri" : "https://reviews.freebsd.org/",
+	"history.immutable" : true
+}

Copied: user/ngie/stable-10-libnv/.arclint (from r292885, stable/10/.arclint)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ngie/stable-10-libnv/.arclint	Tue Dec 29 20:42:42 2015	(r292886, copy of r292885, stable/10/.arclint)
@@ -0,0 +1,25 @@
+{
+  "exclude": "(contrib|crypto)",
+  "linters": {
+    "python": {
+      "type": "pep8",
+      "include": "(\\.py$)"
+    },
+    "spelling": {
+      "type": "spelling"
+    },
+    "chmod": {
+      "type": "chmod"
+    },
+    "merge-conflict": {
+      "type": "merge-conflict"
+    },
+    "filename": {
+      "type": "filename"
+    },
+    "json": {
+      "type": "json",
+      "include": "(\\.arclint|\\.json$)"
+    }
+  }
+}

Modified: user/ngie/stable-10-libnv/sys/fs/devfs/devfs_vnops.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/fs/devfs/devfs_vnops.c	Tue Dec 29 20:36:11 2015	(r292885)
+++ user/ngie/stable-10-libnv/sys/fs/devfs/devfs_vnops.c	Tue Dec 29 20:42:42 2015	(r292886)
@@ -1533,11 +1533,15 @@ devfs_setattr(struct vop_setattr_args *a
 		return (EINVAL);
 	}
 
+	error = devfs_populate_vp(vp);
+	if (error != 0)
+		return (error);
+
 	de = vp->v_data;
 	if (vp->v_type == VDIR)
 		de = de->de_dir;
 
-	error = c = 0;
+	c = 0;
 	if (vap->va_uid == (uid_t)VNOVAL)
 		uid = de->de_uid;
 	else
@@ -1550,8 +1554,8 @@ devfs_setattr(struct vop_setattr_args *a
 		if ((ap->a_cred->cr_uid != de->de_uid) || uid != de->de_uid ||
 		    (gid != de->de_gid && !groupmember(gid, ap->a_cred))) {
 			error = priv_check(td, PRIV_VFS_CHOWN);
-			if (error)
-				return (error);
+			if (error != 0)
+				goto ret;
 		}
 		de->de_uid = uid;
 		de->de_gid = gid;
@@ -1561,8 +1565,8 @@ devfs_setattr(struct vop_setattr_args *a
 	if (vap->va_mode != (mode_t)VNOVAL) {
 		if (ap->a_cred->cr_uid != de->de_uid) {
 			error = priv_check(td, PRIV_VFS_ADMIN);
-			if (error)
-				return (error);
+			if (error != 0)
+				goto ret;
 		}
 		de->de_mode = vap->va_mode;
 		c = 1;
@@ -1571,7 +1575,7 @@ devfs_setattr(struct vop_setattr_args *a
 	if (vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL) {
 		error = vn_utimes_perm(vp, vap, ap->a_cred, td);
 		if (error != 0)
-			return (error);
+			goto ret;
 		if (vap->va_atime.tv_sec != VNOVAL) {
 			if (vp->v_type == VCHR)
 				vp->v_rdev->si_atime = vap->va_atime;
@@ -1593,7 +1597,10 @@ devfs_setattr(struct vop_setattr_args *a
 		else
 			vfs_timestamp(&de->de_mtime);
 	}
-	return (0);
+
+ret:
+	sx_xunlock(&VFSTODEVFS(vp->v_mount)->dm_lock);
+	return (error);
 }
 
 #ifdef MAC

Modified: user/ngie/stable-10-libnv/sys/kern/imgact_elf.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/kern/imgact_elf.c	Tue Dec 29 20:36:11 2015	(r292885)
+++ user/ngie/stable-10-libnv/sys/kern/imgact_elf.c	Tue Dec 29 20:42:42 2015	(r292886)
@@ -993,7 +993,8 @@ __CONCAT(exec_, __elfN(imgact))(struct i
 		}
 		vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
 		if (error != 0) {
-			uprintf("ELF interpreter %s not found\n", interp);
+			uprintf("ELF interpreter %s not found, error %d\n",
+			    interp, error);
 			goto ret;
 		}
 	} else

Modified: user/ngie/stable-10-libnv/usr.sbin/crunch/crunchide/exec_elf32.c
==============================================================================
--- user/ngie/stable-10-libnv/usr.sbin/crunch/crunchide/exec_elf32.c	Tue Dec 29 20:36:11 2015	(r292885)
+++ user/ngie/stable-10-libnv/usr.sbin/crunch/crunchide/exec_elf32.c	Tue Dec 29 20:42:42 2015	(r292886)
@@ -183,6 +183,7 @@ ELFNAMEEND(check)(int fd, const char *fn
 #endif
 	case EM_AARCH64: break;
 	case EM_ARM: break;
+	case EM_IA_64: break;
 	case EM_MIPS: break;
 	case /* EM_MIPS_RS3_LE */ EM_MIPS_RS4_BE: break;
 	case EM_PPC: break;