]>
Commit | Line | Data |
---|---|---|
1 | Make sure exported I2O ioctls utilize userspace safe types. | |
2 | ||
3 | Signed-off-by: Mike Frysinger <vapier@gentoo.org> | |
4 | ||
5 | --- a/include/linux/i2o-dev.h | |
6 | +++ b/include/linux/i2o-dev.h | |
7 | @@ -24,12 +24,13 @@ | |
8 | #define MAX_I2O_CONTROLLERS 32 | |
9 | ||
10 | #include <linux/ioctl.h> | |
11 | +#include <linux/types.h> | |
12 | ||
13 | /* | |
14 | * I2O Control IOCTLs and structures | |
15 | */ | |
16 | #define I2O_MAGIC_NUMBER 'i' | |
17 | -#define I2OGETIOPS _IOR(I2O_MAGIC_NUMBER,0,u8[MAX_I2O_CONTROLLERS]) | |
18 | +#define I2OGETIOPS _IOR(I2O_MAGIC_NUMBER,0,__u8[MAX_I2O_CONTROLLERS]) | |
19 | #define I2OHRTGET _IOWR(I2O_MAGIC_NUMBER,1,struct i2o_cmd_hrtlct) | |
20 | #define I2OLCTGET _IOWR(I2O_MAGIC_NUMBER,2,struct i2o_cmd_hrtlct) | |
21 | #define I2OPARMSET _IOWR(I2O_MAGIC_NUMBER,3,struct i2o_cmd_psetget) | |
22 | @@ -37,7 +38,7 @@ | |
23 | #define I2OSWDL _IOWR(I2O_MAGIC_NUMBER,5,struct i2o_sw_xfer) | |
24 | #define I2OSWUL _IOWR(I2O_MAGIC_NUMBER,6,struct i2o_sw_xfer) | |
25 | #define I2OSWDEL _IOWR(I2O_MAGIC_NUMBER,7,struct i2o_sw_xfer) | |
26 | -#define I2OVALIDATE _IOR(I2O_MAGIC_NUMBER,8,u32) | |
27 | +#define I2OVALIDATE _IOR(I2O_MAGIC_NUMBER,8,__u32) | |
28 | #define I2OHTML _IOWR(I2O_MAGIC_NUMBER,9,struct i2o_html) | |
29 | #define I2OEVTREG _IOW(I2O_MAGIC_NUMBER,10,struct i2o_evt_id) | |
30 | #define I2OEVTGET _IOR(I2O_MAGIC_NUMBER,11,struct i2o_evt_info) |