[src/netbsd-9]: src/sbin/fsck Pull up following revision(s) (requested by tsu...

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

details:   https://anonhg.NetBSD.org/src/rev/ddbfc22a276f
branches:  netbsd-9
changeset: 949331:ddbfc22a276f
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jan 09 19:30:14 2021 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #1184):

        sbin/fsck/partutil.c: revision 1.17

initialize disk_dict to NULL.

otherwise, if DIOCGDISKINFO returns an error != ENXIO getdiskinfo() later
tries to prop_object_release() stack garbage.

found by rumpctrl tests using clang-7.

diffstat:

 sbin/fsck/partutil.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r b477ded7ab61 -r ddbfc22a276f sbin/fsck/partutil.c
--- a/sbin/fsck/partutil.c      Fri Jan 08 13:01:54 2021 +0000
+++ b/sbin/fsck/partutil.c      Sat Jan 09 19:30:14 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: partutil.c,v 1.15.18.1 2019/08/18 13:31:21 msaitoh Exp $       */
+/*     $NetBSD: partutil.c,v 1.15.18.2 2021/01/09 19:30:14 martin Exp $        */
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: partutil.c,v 1.15.18.1 2019/08/18 13:31:21 msaitoh Exp $");
+__RCSID("$NetBSD: partutil.c,v 1.15.18.2 2021/01/09 19:30:14 martin Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -108,6 +108,7 @@
        }
 
        /* Get disk description dictionary */
+       disk_dict = NULL;
        error = prop_dictionary_recv_ioctl(fd, DIOCGDISKINFO, &disk_dict);
 
        /* fail quickly if the device does not exist at all */