Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
003e16bb
Commit
003e16bb
authored
Sep 07, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix more ioctl _IOR/_IOW misusage.
parent
eddef4fe
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
9 deletions
+20
-9
drivers/ieee1394/ieee1394-ioctl.h
drivers/ieee1394/ieee1394-ioctl.h
+6
-2
include/linux/capi.h
include/linux/capi.h
+2
-2
include/linux/i8k.h
include/linux/i8k.h
+2
-2
include/linux/toshiba.h
include/linux/toshiba.h
+1
-1
include/video/sisfb.h
include/video/sisfb.h
+9
-2
No files found.
drivers/ieee1394/ieee1394-ioctl.h
View file @
003e16bb
...
...
@@ -60,9 +60,13 @@
_IOWR('#', 0x14, struct video1394_mmap)
#define VIDEO1394_IOC_UNTALK_CHANNEL \
_IOW ('#', 0x15, int)
/*
* This one is broken: it really wanted
* "sizeof (struct video1394_wait) + sizeof (struct video1394_queue_variable)"
* but got just a "size_t"
*/
#define VIDEO1394_IOC_TALK_QUEUE_BUFFER \
_IOW ('#', 0x16, sizeof (struct video1394_wait) + \
sizeof (struct video1394_queue_variable))
_IOW ('#', 0x16, size_t)
#define VIDEO1394_IOC_TALK_WAIT_BUFFER \
_IOW ('#', 0x17, struct video1394_wait)
#define VIDEO1394_IOC_LISTEN_POLL_BUFFER \
...
...
include/linux/capi.h
View file @
003e16bb
...
...
@@ -36,7 +36,7 @@ typedef struct capi_register_params { /* CAPI_REGISTER */
#define CAPI_MANUFACTURER_LEN 64
#define CAPI_GET_MANUFACTURER _IOWR('C',0x06,
CAPI_MANUFACTURER_LEN)
#define CAPI_GET_MANUFACTURER _IOWR('C',0x06,
int)
/* broken: wanted size 64 (CAPI_MANUFACTURER_LEN) */
/*
* CAPI_GET_VERSION
...
...
@@ -56,7 +56,7 @@ typedef struct capi_version {
*/
#define CAPI_SERIAL_LEN 8
#define CAPI_GET_SERIAL _IOWR('C',0x08,
CAPI_SERIAL_LEN)
#define CAPI_GET_SERIAL _IOWR('C',0x08,
int)
/* broken: wanted size 8 (CAPI_SERIAL_LEN) */
/*
* CAPI_GET_PROFILE
...
...
include/linux/i8k.h
View file @
003e16bb
...
...
@@ -20,8 +20,8 @@
#define I8K_PROC "/proc/i8k"
#define I8K_PROC_FMT "1.0"
#define I8K_BIOS_VERSION _IOR ('i', 0x80,
4)
#define I8K_MACHINE_ID _IOR ('i', 0x81,
16)
#define I8K_BIOS_VERSION _IOR ('i', 0x80,
int)
/* broken: meant 4 bytes */
#define I8K_MACHINE_ID _IOR ('i', 0x81,
int)
/* broken: meant 16 bytes */
#define I8K_POWER_STATUS _IOR ('i', 0x82, size_t)
#define I8K_FN_STATUS _IOR ('i', 0x83, size_t)
#define I8K_GET_TEMP _IOR ('i', 0x84, size_t)
...
...
include/linux/toshiba.h
View file @
003e16bb
...
...
@@ -22,7 +22,7 @@
#define TOSH_PROC "/proc/toshiba"
#define TOSH_DEVICE "/dev/toshiba"
#define TOSH_SMM _IOWR('t', 0x90,
24)
#define TOSH_SMM _IOWR('t', 0x90,
int)
/* broken: meant 24 bytes */
typedef
struct
{
unsigned
int
eax
;
...
...
include/video/sisfb.h
View file @
003e16bb
...
...
@@ -145,9 +145,16 @@ struct video_info {
/* If changing this, vgatypes.h must also be changed (for X driver) */
/* TW: ioctl for identifying and giving some info (esp. memory heap start) */
#define SISFB_GET_INFO _IOR('n',0xF8,sizeof(__u32))
#define SISFB_GET_VBRSTATUS _IOR('n',0xF9,sizeof(__u32))
/*
* NOTE! The ioctl types used to be "size_t" by mistake, but were
* really meant to be __u32. Changed to "__u32" even though that
* changes the value on 64-bit architectures, because the value
* (with a 4-byte size) is also hardwired in vgatypes.h for user
* space exports. So "__u32" is actually more compatible, duh!
*/
#define SISFB_GET_INFO _IOR('n',0xF8,__u32)
#define SISFB_GET_VBRSTATUS _IOR('n',0xF9,__u32)
/* TW: Structure argument for SISFB_GET_INFO ioctl */
typedef
struct
_SISFB_INFO
sisfb_info
,
*
psisfb_info
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment