diff options
| author | Anton Blanchard <anton@samba.org> | 2003-09-11 02:23:25 +1000 |
|---|---|---|
| committer | Anton Blanchard <anton@samba.org> | 2003-09-11 02:23:25 +1000 |
| commit | 57fb620a67c8c8cdb43eba75c13c7279344cf0e1 (patch) | |
| tree | 85691b688409947f4c38af1682222e7d2d497f71 /include | |
| parent | 28c658269b6a5664bb229c37e38536102d38cd08 (diff) | |
ppc64: catch bad ioctl size at compile time, from x86
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc64/ioctl.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/include/asm-ppc64/ioctl.h b/include/asm-ppc64/ioctl.h index 3ba66f7f80e7..b639b83183bf 100644 --- a/include/asm-ppc64/ioctl.h +++ b/include/asm-ppc64/ioctl.h @@ -42,11 +42,21 @@ ((nr) << _IOC_NRSHIFT) | \ ((size) << _IOC_SIZESHIFT)) +/* provoke compile error for invalid uses of size argument */ +extern int __invalid_size_argument_for_IOC; +#define _IOC_TYPECHECK(t) \ + ((sizeof(t) == sizeof(t[1]) && \ + sizeof(t) < (1 << _IOC_SIZEBITS)) ? \ + sizeof(t) : __invalid_size_argument_for_IOC) + /* used to create numbers */ #define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0) -#define _IOR(type,nr,size) _IOC(_IOC_READ,(type),(nr),sizeof(size)) -#define _IOW(type,nr,size) _IOC(_IOC_WRITE,(type),(nr),sizeof(size)) -#define _IOWR(type,nr,size) _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size)) +#define _IOR(type,nr,size) _IOC(_IOC_READ,(type),(nr),(_IOC_TYPECHECK(size))) +#define _IOW(type,nr,size) _IOC(_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size))) +#define _IOWR(type,nr,size) _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size))) +#define _IOR_BAD(type,nr,size) _IOC(_IOC_READ,(type),(nr),sizeof(size)) +#define _IOW_BAD(type,nr,size) _IOC(_IOC_WRITE,(type),(nr),sizeof(size)) +#define _IOWR_BAD(type,nr,size) _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size)) /* used to decode them.. */ #define _IOC_DIR(nr) (((nr) >> _IOC_DIRSHIFT) & _IOC_DIRMASK) |