Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] use __u8/__u32 in userspace ioctl defines for I2O

Make sure exported I2O ioctls utilize userspace safe types.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Cc: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Mike Frysinger and committed by
Linus Torvalds
04611f98 88f6cd0c

+3 -2
+3 -2
include/linux/i2o-dev.h
··· 24 24 #define MAX_I2O_CONTROLLERS 32 25 25 26 26 #include <linux/ioctl.h> 27 + #include <linux/types.h> 27 28 28 29 /* 29 30 * I2O Control IOCTLs and structures 30 31 */ 31 32 #define I2O_MAGIC_NUMBER 'i' 32 - #define I2OGETIOPS _IOR(I2O_MAGIC_NUMBER,0,u8[MAX_I2O_CONTROLLERS]) 33 + #define I2OGETIOPS _IOR(I2O_MAGIC_NUMBER,0,__u8[MAX_I2O_CONTROLLERS]) 33 34 #define I2OHRTGET _IOWR(I2O_MAGIC_NUMBER,1,struct i2o_cmd_hrtlct) 34 35 #define I2OLCTGET _IOWR(I2O_MAGIC_NUMBER,2,struct i2o_cmd_hrtlct) 35 36 #define I2OPARMSET _IOWR(I2O_MAGIC_NUMBER,3,struct i2o_cmd_psetget) ··· 38 37 #define I2OSWDL _IOWR(I2O_MAGIC_NUMBER,5,struct i2o_sw_xfer) 39 38 #define I2OSWUL _IOWR(I2O_MAGIC_NUMBER,6,struct i2o_sw_xfer) 40 39 #define I2OSWDEL _IOWR(I2O_MAGIC_NUMBER,7,struct i2o_sw_xfer) 41 - #define I2OVALIDATE _IOR(I2O_MAGIC_NUMBER,8,u32) 40 + #define I2OVALIDATE _IOR(I2O_MAGIC_NUMBER,8,__u32) 42 41 #define I2OHTML _IOWR(I2O_MAGIC_NUMBER,9,struct i2o_html) 43 42 #define I2OEVTREG _IOW(I2O_MAGIC_NUMBER,10,struct i2o_evt_id) 44 43 #define I2OEVTGET _IOR(I2O_MAGIC_NUMBER,11,struct i2o_evt_info)