Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/fs/udf When udf_symlink() fails, do not explicitly call ...



details:   https://anonhg.NetBSD.org/src/rev/e1200eceff1e
branches:  trunk
changeset: 335883:e1200eceff1e
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Jan 28 14:00:58 2015 +0000

description:
When udf_symlink() fails, do not explicitly call udf_delete_node(), as
vrele() called next will do that again - avoids a double free of the
bitmap, leading to a KASSERT failure (or worse in real life) in the
udf_symlink_long in the fs/vfs::t_vnops test.

diffstat:

 sys/fs/udf/udf_vnops.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 495f3eb2704c -r e1200eceff1e sys/fs/udf/udf_vnops.c
--- a/sys/fs/udf/udf_vnops.c    Wed Jan 28 12:08:00 2015 +0000
+++ b/sys/fs/udf/udf_vnops.c    Wed Jan 28 14:00:58 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_vnops.c,v 1.96 2015/01/04 14:23:37 reinoud Exp $ */
+/* $NetBSD: udf_vnops.c,v 1.97 2015/01/28 14:00:58 martin 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.96 2015/01/04 14:23:37 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.97 2015/01/28 14:00:58 martin Exp $");
 #endif /* not lint */
 
 
@@ -1741,7 +1741,6 @@
                if (error) {
                        /* remove node */
                        udf_dir_detach(udf_node->ump, dir_node, udf_node, cnp);
-                       udf_delete_node(udf_node);
                        vrele(*vpp);
                        *vpp = NULL;
                }



Home | Main Index | Thread Index | Old Index