[src/trunk]: src/sys/compat/common For the built-in COMPAT_30 module code, ma...

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

details:   https://anonhg.NetBSD.org/src/rev/26d15f29a12e
branches:  trunk
changeset: 967944:26d15f29a12e
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sat Dec 28 15:39:52 2019 +0000

description:
For the built-in COMPAT_30 module code, make sure to initialize the
uipc_syscalls_30 stuff, notably to include compat_30_socket().

PR kern/54804

XXX Pullup-9 XXX

diffstat:

 sys/compat/common/compat_30_mod.c |  22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diffs (59 lines):

diff -r e5af0c7ea5c3 -r 26d15f29a12e sys/compat/common/compat_30_mod.c
--- a/sys/compat/common/compat_30_mod.c Sat Dec 28 15:38:16 2019 +0000
+++ b/sys/compat/common/compat_30_mod.c Sat Dec 28 15:39:52 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_30_mod.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $       */
+/*     $NetBSD: compat_30_mod.c,v 1.3 2019/12/28 15:39:52 pgoyette Exp $       */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_30_mod.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_30_mod.c,v 1.3 2019/12/28 15:39:52 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -66,6 +66,12 @@
                vfs_syscalls_30_fini();
                return error;
        }
+       error = uipc_syscalls_30_init();
+       if (error != 0) {
+               kern_time_30_fini();
+               vfs_syscalls_30_fini();
+               return error;
+       }
        bio_30_init();
        vnd_30_init();
        usb_30_init();
@@ -82,18 +88,24 @@
        vnd_30_fini();
        bio_30_fini();
 
+       error = uipc_syscalls_30_fini();
+       if (error != 0)
+               goto err1;
+
        error = kern_time_30_fini();
        if (error != 0)
-               goto err1;
+               goto err2;
 
        error = vfs_syscalls_30_fini();
        if (error != 0)
-               goto err2;
+               goto err3;
 
        return 0;
 
+ err3:
+       kern_time_30_init();
  err2:
-       kern_time_30_init();
+       uipc_syscalls_30_init();
  err1:
        bio_30_init();
        vnd_30_init();