Page MenuHomeFreeBSD
Differential D14672

Fix FSACTL_GET_NEXT_ADAPTER_FIB under 32-bit compat.
ClosedPublic
Actions

Authored by brooks on Mar 12 2018, 8:52 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 9, 3:49 PM
Unknown Object (File)
Mar 4 2025, 2:36 PM
Unknown Object (File)
Mar 1 2025, 7:42 PM
Unknown Object (File)
Jan 22 2025, 4:35 PM
Unknown Object (File)
Jan 14 2025, 2:34 PM
Unknown Object (File)
Jan 11 2025, 4:08 AM
Unknown Object (File)
Jan 10 2025, 11:07 AM
Unknown Object (File)
Nov 20 2024, 6:31 AM
View All Files
Subscribers
None

Details

Reviewers
avg
asomers
imp
cem
Commits
rS331637: MFC r330949:
rS331636: MFC r330949:
rS330949: Fix FSACTL_GET_NEXT_ADAPTER_FIB under 32-bit compat.
Summary

This includes FSACTL_LNX_GET_NEXT_ADAPTER_FIB.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

brooks created this revision.Mar 12 2018, 8:52 PM
Harbormaster completed remote builds in B15525: Diff 40219.Mar 12 2018, 8:52 PM
cem accepted this revision.Mar 13 2018, 9:24 PM

Seems harmless.

This revision is now accepted and ready to land.Mar 13 2018, 9:24 PM
brooks updated this revision to Diff 40294.Mar 14 2018, 8:04 PM
  • Add opt_compat.h for standalone module builds.
This revision now requires review to proceed.Mar 14 2018, 8:04 PM
Harbormaster completed remote builds in B15567: Diff 40294.Mar 14 2018, 8:04 PM
cem accepted this revision.Mar 14 2018, 8:59 PM

👌

This revision is now accepted and ready to land.Mar 14 2018, 8:59 PM
Closed by commit rS330949: Fix FSACTL_GET_NEXT_ADAPTER_FIB under 32-bit compat. (authored by brooks). · Explain WhyMar 14 2018, 9:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
sys/
dev/
aac/
17 lines
aacraid/
17 lines
modules/
aac/
2 lines
aacraid/
2 lines
sys/
8 lines

Diff 40298

View Options

head/sys/dev/aac/aac.c

Show All 32 Lines
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
/* /*
* Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters.
*/ */
#define AAC_DRIVERNAME "aac" #define AAC_DRIVERNAME "aac"
#include "opt_aac.h" #include "opt_aac.h"
#include "opt_compat.h"
/* #include <stddef.h> */ /* #include <stddef.h> */
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/malloc.h> #include <sys/malloc.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/kthread.h> #include <sys/kthread.h>
#include <sys/proc.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/sysent.h>
#include <sys/poll.h> #include <sys/poll.h>
#include <sys/ioccom.h> #include <sys/ioccom.h>
#include <sys/bus.h> #include <sys/bus.h>
#include <sys/conf.h> #include <sys/conf.h>
#include <sys/signalvar.h> #include <sys/signalvar.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/eventhandler.h> #include <sys/eventhandler.h>
▲ Show 20 Lines • Show All 3,459 Lines • ▼ Show 20 Lines
aac_getnext_aif(struct aac_softc *sc, caddr_t arg) aac_getnext_aif(struct aac_softc *sc, caddr_t arg)
{ {
struct get_adapter_fib_ioctl agf; struct get_adapter_fib_ioctl agf;
struct aac_fib_context *ctx; struct aac_fib_context *ctx;
int error; int error;
fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); 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) { for (ctx = sc->fibctx; ctx; ctx = ctx->next) {
if (agf.AdapterFibContext == ctx->unique) if (agf.AdapterFibContext == ctx->unique)
break; break;
} }
if (!ctx) if (!ctx)
return (EFAULT); return (EFAULT);
error = aac_return_aif(sc, ctx, agf.AifFib); error = aac_return_aif(sc, ctx, agf.AifFib);
▲ Show 20 Lines • Show All 272 Lines • Show Last 20 Lines
View Options

head/sys/dev/aacraid/aacraid.c

Show All 33 Lines
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
/* /*
* Driver for the Adaptec by PMC Series 6,7,8,... families of RAID controllers * Driver for the Adaptec by PMC Series 6,7,8,... families of RAID controllers
*/ */
#define AAC_DRIVERNAME "aacraid" #define AAC_DRIVERNAME "aacraid"
#include "opt_aacraid.h" #include "opt_aacraid.h"
#include "opt_compat.h"
/* #include <stddef.h> */ /* #include <stddef.h> */
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/malloc.h> #include <sys/malloc.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/kthread.h> #include <sys/kthread.h>
#include <sys/proc.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/sysent.h>
#include <sys/poll.h> #include <sys/poll.h>
#include <sys/ioccom.h> #include <sys/ioccom.h>
#include <sys/bus.h> #include <sys/bus.h>
#include <sys/conf.h> #include <sys/conf.h>
#include <sys/signalvar.h> #include <sys/signalvar.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/eventhandler.h> #include <sys/eventhandler.h>
▲ Show 20 Lines • Show All 3,318 Lines • ▼ Show 20 Lines
{ {
struct get_adapter_fib_ioctl agf; struct get_adapter_fib_ioctl agf;
struct aac_fib_context *ctx; struct aac_fib_context *ctx;
int error; int error;
fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
mtx_lock(&sc->aac_io_lock); 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) { for (ctx = sc->fibctx; ctx; ctx = ctx->next) {
if (agf.AdapterFibContext == ctx->unique) if (agf.AdapterFibContext == ctx->unique)
break; break;
} }
if (!ctx) { if (!ctx) {
mtx_unlock(&sc->aac_io_lock); mtx_unlock(&sc->aac_io_lock);
return (EFAULT); return (EFAULT);
} }
▲ Show 20 Lines • Show All 472 Lines • Show Last 20 Lines
View Options

head/sys/modules/aac/Makefile

# $FreeBSD$ # $FreeBSD$
.PATH: ${SRCTOP}/sys/dev/aac .PATH: ${SRCTOP}/sys/dev/aac
.if ${MACHINE_CPUARCH} == "i386" .if ${MACHINE_CPUARCH} == "i386"
SUBDIR= aac_linux SUBDIR= aac_linux
.endif .endif
KMOD= aac KMOD= aac
SRCS= aac.c aac_pci.c aac_disk.c aac_cam.c 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 SRCS+= device_if.h bus_if.h pci_if.h
# To enable debug output from the driver, uncomment these two lines. # To enable debug output from the driver, uncomment these two lines.
#CFLAGS+= -DAAC_DEBUG=2 #CFLAGS+= -DAAC_DEBUG=2
#SRCS+= aac_debug.c #SRCS+= aac_debug.c
.include <bsd.kmod.mk> .include <bsd.kmod.mk>
View Options

head/sys/modules/aacraid/Makefile

# $FreeBSD$ # $FreeBSD$
.PATH: ${SRCTOP}/sys/dev/aacraid .PATH: ${SRCTOP}/sys/dev/aacraid
.if ${MACHINE_CPUARCH} == "i386" .if ${MACHINE_CPUARCH} == "i386"
SUBDIR= aacraid_linux SUBDIR= aacraid_linux
.endif .endif
KMOD= aacraid KMOD= aacraid
SRCS= aacraid.c aacraid_pci.c aacraid_cam.c 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 SRCS+= device_if.h bus_if.h pci_if.h
# To enable debug output from the driver, uncomment these two lines. # To enable debug output from the driver, uncomment these two lines.
#CFLAGS+= -DAACRAID_DEBUG=2 #CFLAGS+= -DAACRAID_DEBUG=2
#SRCS+= aacraid_debug.c #SRCS+= aacraid_debug.c
.include <bsd.kmod.mk> .include <bsd.kmod.mk>
View Options

head/sys/sys/aac_ioctl.h

Loading...