[src/trunk]: src/sys/fs/udf Pull forward the node creation returned from the ...

[reinoud <reinoud%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d15305e14f4b
branches:  trunk
changeset: 787842:d15305e14f4b
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Sun Jul 07 20:16:22 2013 +0000

description:
Pull forward the node creation returned from the lookup call. Its vnode is
used in the access determination on delete/rename of TXT files.

Thanks for joerg@ and clang for detecting this!

diffstat:

 sys/fs/udf/udf_vnops.c |  19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diffs (56 lines):

diff -r 77eb33a96f42 -r d15305e14f4b sys/fs/udf/udf_vnops.c
--- a/sys/fs/udf/udf_vnops.c    Sun Jul 07 19:49:44 2013 +0000
+++ b/sys/fs/udf/udf_vnops.c    Sun Jul 07 20:16:22 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_vnops.c,v 1.82 2013/07/07 19:49:44 reinoud Exp $ */
+/* $NetBSD: udf_vnops.c,v 1.83 2013/07/07 20:16:22 reinoud Exp $ */
 
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.82 2013/07/07 19:49:44 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.83 2013/07/07 20:16:22 reinoud Exp $");
 #endif /* not lint */
 
 
@@ -787,12 +787,19 @@
         * a link. It seems to function well without this code.
         */
 
+       /* try to create/reuse the node */
+       error = udf_get_node(ump, &icb_loc, &res_node);
+       if (error)
+               goto out;
+
        /* check the permissions */
        if (islastcn && (cnp->cn_nameiop == DELETE ||
                         cnp->cn_nameiop == RENAME)  ) {
                error = VOP_ACCESS(dvp, VWRITE, cnp->cn_cred);
-               if (error)
+               if (error) {
+                       vput(res_node->vnode);
                        goto out;
+               }
 
                /* get node attributes */
                mode = udf_getaccessmode(dir_node);
@@ -804,14 +811,12 @@
                            d_uid, d_uid));
                        if (error) {
                                error = EPERM;
+                               vput(res_node->vnode);
                                goto out;
                        }
                }
        }
-       /* try to create/reuse the node */
-       error = udf_get_node(ump, &icb_loc, &res_node);
-       if (error)
-               goto out;
+
        *vpp = res_node->vnode;
 
 done: