summaryrefslogtreecommitdiff
path: root/include/linux/serial.h
diff options
context:
space:
mode:
authorAndrew Victor <andrew@com.rmk.(none)>2003-10-28 09:36:10 +0000
committerRussell King <rmk@flint.arm.linux.org.uk>2003-10-28 09:36:10 +0000
commit3c8e39d4b5ca150438470e5dae02eb6dba77ee01 (patch)
treea1b6ef251987260f15dab1adb7a3d052c02aa9d7 /include/linux/serial.h
parentedf12049eae51473bf5050646d9b9787ee648926 (diff)
[SERIAL PATCH] 1672/1: Restore sizeof(struct serial_struct)
Patch from SAN People Patch 2.4.21-rmk1 added a "iomap_base" field to the serial_struct structure (include/linux/serial.h). Since that structure is exported to user-space it should be consistent between revisions of the stable 2.4 kernels. This patch removes 4 bytes (were "reserved") to restore the size of the structure. Without this patch, ioctl(TIOCGSERIAL) will copy_to_user() 4 bytes more than expected and possibly corrupt the application's stack/heap.
Diffstat (limited to 'include/linux/serial.h')
-rw-r--r--include/linux/serial.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/serial.h b/include/linux/serial.h
index 677e67b18220..465f19a0d53d 100644
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -49,7 +49,6 @@ struct serial_struct {
unsigned short iomem_reg_shift;
unsigned int port_high;
unsigned long iomap_base; /* cookie passed into ioremap */
- int reserved[1];
};
/*