[src/netbsd-8]: src/sys/fs/tmpfs Pull up following revision(s) (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/70db1bfc0714
branches:  netbsd-8
changeset: 453876:70db1bfc0714
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Aug 29 16:26:46 2019 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #1345):

        sys/fs/tmpfs/tmpfs_rename.c: revision 1.9

Fix uninitialized variable: if 'tvp' is NULL, '*tdep' is not initialized.

This could have caused the KASSERT to wrongfully fire.

ok riastradh@

diffstat:

 sys/fs/tmpfs/tmpfs_rename.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 87e6f91a4de6 -r 70db1bfc0714 sys/fs/tmpfs/tmpfs_rename.c
--- a/sys/fs/tmpfs/tmpfs_rename.c       Mon Aug 26 13:17:02 2019 +0000
+++ b/sys/fs/tmpfs/tmpfs_rename.c       Thu Aug 29 16:26:46 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tmpfs_rename.c,v 1.8 2015/07/06 10:24:59 wiz Exp $     */
+/*     $NetBSD: tmpfs_rename.c,v 1.8.10.1 2019/08/29 16:26:46 martin Exp $     */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_rename.c,v 1.8 2015/07/06 10:24:59 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_rename.c,v 1.8.10.1 2019/08/29 16:26:46 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -282,7 +282,7 @@
        KASSERT(tcnp != NULL);
        KASSERT(tdep != NULL);
        KASSERT(fdep != tdep);
-       KASSERT((*fdep) != (*tdep));
+       KASSERT((tvp == NULL) || (*fdep) != (*tdep));
        KASSERT((*fdep) != NULL);
        KASSERT((*fdep)->td_node == VP_TO_TMPFS_NODE(fvp));
        KASSERT((tvp == NULL) || ((*tdep) != NULL));