From cb6e2404af96679ee77ed6a83a55431809cedf90 Mon Sep 17 00:00:00 2001
From: reinoud <reinoud@NetBSD.org>
Date: Thu, 10 Jul 2008 16:41:00 +0000
Subject: [PATCH] On node creation, follow tmpfs and UFS by generating the
 uid/gid pair. This fixes the lack of file ownership preservation on
 file/directory creation.

See PR kern/39124
---
 sys/fs/udf/udf_subr.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys/fs/udf/udf_subr.c b/sys/fs/udf/udf_subr.c
index 51857bd32102..5a53c3d5330d 100644
--- a/sys/fs/udf/udf_subr.c
+++ b/sys/fs/udf/udf_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.55 2008/07/07 18:45:27 reinoud Exp $ */
+/* $NetBSD: udf_subr.c,v 1.56 2008/07/10 16:41:00 reinoud Exp $ */
 
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.55 2008/07/07 18:45:27 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.56 2008/07/10 16:41:00 reinoud Exp $");
 #endif /* not lint */
 
 
@@ -4977,6 +4977,8 @@ udf_create_node_raw(struct vnode *dvp, struct vnode **vpp, int udf_file_type,
 	uint64_t lmapping, pmapping;
 	uint32_t lb_size, lb_num;
 	uint16_t vpart_num;
+	uid_t uid;
+	gid_t gid, parent_gid;
 	int fid_size, error;
 
 	lb_size = udf_rw32(ump->logical_vol->lb_size);
@@ -5037,8 +5039,10 @@ udf_create_node_raw(struct vnode *dvp, struct vnode **vpp, int udf_file_type,
 	/* get parent's unique ID for refering '..' if its a directory */
 	if (dir_node->fe) {
 		parent_unique_id = udf_rw64(dir_node->fe->unique_id);
+		parent_gid       = (gid_t) udf_rw32(dir_node->fe->gid);
 	} else {
 		parent_unique_id = udf_rw64(dir_node->efe->unique_id);
+		parent_gid       = (gid_t) udf_rw32(dir_node->efe->gid);
 	}
 
 	/* get descriptor */
@@ -5067,7 +5071,9 @@ udf_create_node_raw(struct vnode *dvp, struct vnode **vpp, int udf_file_type,
 	udf_setaccessmode(udf_node, vap->va_mode);
 
 	/* set ownership */
-	udf_setownership(udf_node, vap->va_uid, vap->va_gid);
+	uid = kauth_cred_geteuid(cnp->cn_cred);
+	gid = parent_gid;
+	udf_setownership(udf_node, uid, gid);
 
 	error = udf_dir_attach(ump, dir_node, udf_node, vap, cnp);
 	if (error) {