[src/pgoyette-compat]: src/sys/kern In the data returned by MODCTL_STAT, incl...

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

details:   https://anonhg.NetBSD.org/src/rev/b01ecb9b5537
branches:  pgoyette-compat
changeset: 321141:b01ecb9b5537
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sun Apr 01 10:47:53 2018 +0000

description:
In the data returned by MODCTL_STAT, include alias information for
modules that are still on the built-in list.

diffstat:

 sys/kern/sys_module.c |  30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)

diffs (65 lines):

diff -r 0e0fac316593 -r b01ecb9b5537 sys/kern/sys_module.c
--- a/sys/kern/sys_module.c     Sat Mar 31 11:45:33 2018 +0000
+++ b/sys/kern/sys_module.c     Sun Apr 01 10:47:53 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys_module.c,v 1.23.2.3 2018/03/11 08:32:21 pgoyette Exp $     */
+/*     $NetBSD: sys_module.c,v 1.23.2.4 2018/04/01 10:47:53 pgoyette Exp $     */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23.2.3 2018/03/11 08:32:21 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23.2.4 2018/04/01 10:47:53 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"
@@ -110,6 +110,17 @@
        return error;
 }
 
+static void
+copy_alias(modstat_t ms, const char * const *aliasp, modinfo_t mi, module_t mod)
+{
+
+       strlcpy(ms->ms_name, *aliasp, sizeof(ms->ms_name));
+       strlcpy(ms->ms_required, mi->mi_name, sizeof(ms->ms_required));
+       ms->ms_class = mi->mi_class;
+       ms->ms_source = mod->mod_source;
+       ms->ms_flags = mod->mod_flags | MODFLG_IS_ALIAS;
+}
+
 static int
 handle_modctl_stat(struct iovec *iov, void *arg)
 {
@@ -163,12 +174,7 @@
                if (aliasp == NULL)
                        continue;
                while (*aliasp) {
-                       strlcpy(ms->ms_name, *aliasp, sizeof(ms->ms_name));
-                       strlcpy(ms->ms_required, mi->mi_name,
-                           sizeof(ms->ms_required));
-                       ms->ms_class = mi->mi_class;
-                       ms->ms_source = mod->mod_source;
-                       ms->ms_flags = mod->mod_flags | MODFLG_IS_ALIAS;
+                       copy_alias(ms, aliasp, mi, mod);
                        aliasp++;
                        ms++;
                }
@@ -190,6 +196,14 @@
                KASSERT(mod->mod_source == MODULE_SOURCE_KERNEL);
                ms->ms_source = mod->mod_source;
                ms++;
+               aliasp = *mi->mi_aliases;
+               if (aliasp == NULL)
+                       continue;
+               while (*aliasp) {
+                       copy_alias(ms, aliasp, mi, mod);
+                       aliasp++;
+                       ms++;
+               }
        }
        kernconfig_unlock();
        error = copyout(mso, iov->iov_base,