[src/trunk]: src/sys/dev/raidframe - Restore indirecting through the data poi...

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

details:   https://anonhg.NetBSD.org/src/rev/9b055e3330df
branches:  trunk
changeset: 448674:9b055e3330df
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Feb 06 23:00:16 2019 +0000

description:
- Restore indirecting through the data pointer
- Don't try to load compat code if the ioctl is not for us.

diffstat:

 sys/dev/raidframe/rf_netbsdkintf.c |  15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r 429688396f58 -r 9b055e3330df sys/dev/raidframe/rf_netbsdkintf.c
--- a/sys/dev/raidframe/rf_netbsdkintf.c        Wed Feb 06 22:54:41 2019 +0000
+++ b/sys/dev/raidframe/rf_netbsdkintf.c        Wed Feb 06 23:00:16 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_netbsdkintf.c,v 1.371 2019/02/06 03:37:13 oster Exp $       */
+/*     $NetBSD: rf_netbsdkintf.c,v 1.372 2019/02/06 23:00:16 christos Exp $    */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  ***********************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.371 2019/02/06 03:37:13 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.372 2019/02/06 23:00:16 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_raid_autoconfig.h"
@@ -1153,6 +1153,8 @@
 static int
 rf_getConfiguration(struct raid_softc *rs, void *data, RF_Config_t **k_cfg)
 {
+       RF_Config_t *u_cfg = *((RF_Config_t **) data);
+
        if (rs->sc_r.valid) {
                /* There is a valid RAID set running on this unit! */
                printf("raid%d: Device already configured!\n", rs->sc_unit);
@@ -1165,7 +1167,7 @@
        if (*k_cfg == NULL) {
                return ENOMEM;
        }
-       int retcode = copyin(data, k_cfg, sizeof(RF_Config_t));
+       int retcode = copyin(u_cfg, k_cfg, sizeof(RF_Config_t));
        if (retcode == 0)
                return 0;
        RF_Free(*k_cfg, sizeof(RF_Config_t));
@@ -1707,6 +1709,13 @@
                return retcode;
 #endif
        default:
+               /*
+                * Don't bother trying to load compat modules
+                * if it is not our ioctl. This is more efficient
+                * and makes rump tests not depend on compat code
+                */
+               if (IOCGROUP(cmd) != 'r')
+                       break;
 #ifdef _LP64
                if ((l->l_proc->p_flag & PK_32) != 0) {
                        module_autoload("compat_netbsd32_raid",