Module Name:    src
Committed By:   msaitoh
Date:           Wed Sep 12 02:24:25 UTC 2018

Modified Files:
        src/sys/compat/common: uipc_syscalls_50.c

Log Message:
 Fix a bug that SIOC[GZ]IFDATA returned old ifreq structure.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/common/uipc_syscalls_50.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/compat/common/uipc_syscalls_50.c
diff -u src/sys/compat/common/uipc_syscalls_50.c:1.5 src/sys/compat/common/uipc_syscalls_50.c:1.6
--- src/sys/compat/common/uipc_syscalls_50.c:1.5	Thu Apr 26 08:11:18 2018
+++ src/sys/compat/common/uipc_syscalls_50.c	Wed Sep 12 02:24:25 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_syscalls_50.c,v 1.5 2018/04/26 08:11:18 roy Exp $	*/
+/*	$NetBSD: uipc_syscalls_50.c,v 1.6 2018/09/12 02:24:25 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_50.c,v 1.5 2018/04/26 08:11:18 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_50.c,v 1.6 2018/09/12 02:24:25 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -65,23 +65,24 @@ compat_ifdatareq(struct lwp *l, u_long c
 
 	/* Validate arguments. */
 	switch (cmd) {
-	case SIOCGIFDATA:
-	case SIOCZIFDATA:
-		ifp = ifunit(ifdr->ifdr_name);
-		if (ifp == NULL)
-			return ENXIO;
+	case OSIOCGIFDATA:
+	case OSIOCZIFDATA:
 		break;
 	default:
 		return ENOSYS;
 	}
 
+	ifp = ifunit(ifdr->ifdr_name);
+	if (ifp == NULL)
+		return ENXIO;
+
 	/* Do work. */
 	switch (cmd) {
-	case SIOCGIFDATA:
+	case OSIOCGIFDATA:
 		ifdatan2o(&ifdr->ifdr_data, &ifp->if_data);
 		return 0;
 
-	case SIOCZIFDATA:
+	case OSIOCZIFDATA:
 		if (l != NULL) {
 			error = kauth_authorize_network(l->l_cred,
 			    KAUTH_NETWORK_INTERFACE,

Reply via email to