From 28e7752907f02a8ef4db3ba4037414d3373a6780 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Fri, 16 Mar 2018 22:23:04 +0000 Subject: [PATCH] Add _IOC_NEWLEN() and _IOC_NEWTYPE() macros. These macros take an existing ioctl(2) command and replace the length with the specified length or length of the specified type respectively. These can be used to define commands for 32-bit compatibility with fewer opportunities for cut-and-paste errors then a whole new definition. Reviewed by: cem, kib Obtained from: CheriBSD Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D14706 --- sys/sys/ioccom.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h index 1fa05d0a800..3e5f7200fb1 100644 --- a/sys/sys/ioccom.h +++ b/sys/sys/ioccom.h @@ -61,6 +61,10 @@ #define _IOW(g,n,t) _IOC(IOC_IN, (g), (n), sizeof(t)) /* this should be _IORW, but stdio got there first */ #define _IOWR(g,n,t) _IOC(IOC_INOUT, (g), (n), sizeof(t)) +/* Replace length/type in an ioctl command. */ +#define _IOC_NEWLEN(ioc, len) \ + (((~(IOCPARM_MASK << 16)) & (ioc)) | (((len) & IOCPARM_MASK) << 16)) +#define _IOC_NEWTYPE(ioc, type) _IOC_NEWLEN((ioc), sizeof(type)) #ifdef _KERNEL