[src/netbsd-8]: src/sys/compat/ultrix Pull up following revision(s) (requeste...

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

details:   https://anonhg.NetBSD.org/src/rev/b5e745f51402
branches:  netbsd-8
changeset: 434490:b5e745f51402
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Dec 21 19:08:10 2017 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #434):
        sys/compat/ultrix/ultrix_fs.c: revision 1.58
Fix uninitialized pointer, found by Mootja. Not a surprise in untested
code.

diffstat:

 sys/compat/ultrix/ultrix_fs.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 14c01ea1c1bc -r b5e745f51402 sys/compat/ultrix/ultrix_fs.c
--- a/sys/compat/ultrix/ultrix_fs.c     Sun Dec 10 10:33:40 2017 +0000
+++ b/sys/compat/ultrix/ultrix_fs.c     Thu Dec 21 19:08:10 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ultrix_fs.c,v 1.57 2017/04/13 09:18:18 hannken Exp $   */
+/*     $NetBSD: ultrix_fs.c,v 1.57.4.1 2017/12/21 19:08:10 snj Exp $   */
 
 /*
  * Copyright (c) 1995, 1997 Jonathan Stone
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.57 2017/04/13 09:18:18 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.57.4.1 2017/12/21 19:08:10 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -276,7 +276,7 @@
                                make_ultrix_mntent(sp, &tem);
                                if ((error = copyout((void *)&tem, sfsp,
                                    sizeof(tem))) != 0) {
-                                       goto bad;
+                                       goto bad_freeiter;
                                }
                                sfsp++;
                                count++;
@@ -289,8 +289,9 @@
        else
                *retval = count;
 
+bad_freeiter:
+       mountlist_iterator_destroy(iter);
 bad:
-       mountlist_iterator_destroy(iter);
        if (path)
                free(path, M_TEMP);
        return error;