d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix FSACTL_GET_NEXT_ADAPTER_FIB under 32-bit compat.

Browse Source 
This includes FSACTL_LNX_GET_NEXT_ADAPTER_FIB.

Reviewed by:	cem
Obtained from:	CheriBSD
MFC after:	1 week
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D14672
This commit is contained in:
Brooks Davis 2018-03-14 21:11:41 +00:00
parent eee6300f1a
commit f287c3e4d3
5 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/aac/aac.c
View File

@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
#define AAC_DRIVERNAME "aac"
#include "opt_aac.h"
#include "opt_compat.h"
/* #include <stddef.h> */
#include <sys/param.h>
@ -45,7 +46,9 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/proc.h>
#include <sys/sysctl.h>
#include <sys/sysent.h>
#include <sys/poll.h>
#include <sys/ioccom.h>
@ -3521,7 +3524,19 @@ aac_getnext_aif(struct aac_softc *sc, caddr_t arg)
fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
if ((error = copyin(arg, &agf, sizeof(agf))) == 0) {
#ifdef COMPAT_FREEBSD32
if (SV_CURPROC_FLAG(SV_ILP32)) {
struct get_adapter_fib_ioctl32 agf32;
error = copyin(arg, &agf32, sizeof(agf32));
if (error == 0) {
agf.AdapterFibContext = agf32.AdapterFibContext;
agf.Wait = agf32.Wait;
agf.AifFib = (caddr_t)(uintptr_t)agf32.AifFib;
}
} else
#endif
error = copyin(arg, &agf, sizeof(agf));
if (error == 0) {
for (ctx = sc->fibctx; ctx; ctx = ctx->next) {
if (agf.AdapterFibContext == ctx->unique)
break;

17
sys/dev/aacraid/aacraid.c
View File

@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
#define AAC_DRIVERNAME "aacraid"
#include "opt_aacraid.h"
#include "opt_compat.h"
/* #include <stddef.h> */
#include <sys/param.h>
@ -46,7 +47,9 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/proc.h>
#include <sys/sysctl.h>
#include <sys/sysent.h>
#include <sys/poll.h>
#include <sys/ioccom.h>
@ -3381,7 +3384,19 @@ aac_getnext_aif(struct aac_softc *sc, caddr_t arg)
fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
mtx_lock(&sc->aac_io_lock);
if ((error = copyin(arg, &agf, sizeof(agf))) == 0) {
#ifdef COMPAT_FREEBSD32
if (SV_CURPROC_FLAG(SV_ILP32)) {
struct get_adapter_fib_ioctl32 agf32;
error = copyin(arg, &agf32, sizeof(agf32));
if (error == 0) {
agf.AdapterFibContext = agf32.AdapterFibContext;
agf.Wait = agf32.Wait;
agf.AifFib = (caddr_t)(uintptr_t)agf32.AifFib;
}
} else
#endif
error = copyin(arg, &agf, sizeof(agf));
if (error == 0) {
for (ctx = sc->fibctx; ctx; ctx = ctx->next) {
if (agf.AdapterFibContext == ctx->unique)
break;

2
sys/modules/aac/Makefile
View File

@ -8,7 +8,7 @@ SUBDIR= aac_linux
KMOD= aac
SRCS= aac.c aac_pci.c aac_disk.c aac_cam.c
SRCS+= opt_scsi.h opt_cam.h opt_aac.h
SRCS+= opt_scsi.h opt_cam.h opt_compat.h opt_aac.h
SRCS+= device_if.h bus_if.h pci_if.h
# To enable debug output from the driver, uncomment these two lines.

2
sys/modules/aacraid/Makefile
View File

@ -8,7 +8,7 @@ SUBDIR= aacraid_linux
KMOD= aacraid
SRCS= aacraid.c aacraid_pci.c aacraid_cam.c
SRCS+= opt_scsi.h opt_cam.h opt_aacraid.h
SRCS+= opt_scsi.h opt_cam.h opt_compat.h opt_aacraid.h
SRCS+= device_if.h bus_if.h pci_if.h
# To enable debug output from the driver, uncomment these two lines.

8
sys/sys/aac_ioctl.h
View File

@ -175,6 +175,14 @@ struct get_adapter_fib_ioctl {
caddr_t AifFib;
};
#ifdef _KERNEL
struct get_adapter_fib_ioctl32 {
u_int32_t AdapterFibContext;
int Wait;
u_int32_t AifFib;
};
#endif
struct aac_query_disk {
int32_t ContainerNumber;
int32_t Bus;