X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=kernel-bfs-2.6.28%2Fdebian%2Fpatches%2Fdspbridge_ioctl_buffer_overrun.diff;fp=kernel-bfs-2.6.28%2Fdebian%2Fpatches%2Fdspbridge_ioctl_buffer_overrun.diff;h=0000000000000000000000000000000000000000;hb=7d2c5a305e4febc0a496fc3f82c3c9eb836c7037;hp=c67bfe5e6e4423ae922257b2e90a3f6bdf62be18;hpb=7d6878988e2fa48156c5a550340f5fce2da4e670;p=kernel-bfs

diff --git a/kernel-bfs-2.6.28/debian/patches/dspbridge_ioctl_buffer_overrun.diff b/kernel-bfs-2.6.28/debian/patches/dspbridge_ioctl_buffer_overrun.diff
deleted file mode 100644
index c67bfe5..0000000
--- a/kernel-bfs-2.6.28/debian/patches/dspbridge_ioctl_buffer_overrun.diff
+++ /dev/null
@@ -1,40 +0,0 @@
----
- drivers/dsp/bridge/pmgr/wcd.c |   12 ++++++++++--
- 1 files changed, 10 insertions(+), 2 deletions(-)
-
-Index: kernel-power-2.6.28/drivers/dsp/bridge/pmgr/wcd.c
-===================================================================
---- kernel-power-2.6.28.orig/drivers/dsp/bridge/pmgr/wcd.c
-+++ kernel-power-2.6.28/drivers/dsp/bridge/pmgr/wcd.c
-@@ -242,21 +242,29 @@
- 				    u32 *result, void *pr_ctxt)
- {
- 	u32 (*ioctl_cmd)(union Trapped_Args *args, void *pr_ctxt) = NULL;
--	int i;
-+	u32 i;
- 
- 	if (_IOC_TYPE(cmd) != DB) {
- 		pr_err("%s: Incompatible dspbridge ioctl number\n", __func__);
- 		goto err;
- 	}
--
-+#ifdef CONFIG_BRIDGE_NEW_API
- 	if (DB_GET_IOC_TABLE(cmd) > ARRAY_SIZE(size_cmd)) {
-+#else
-+	if (DB_GET_IOC_TABLE(cmd) >= ARRAY_SIZE(size_cmd)) {
-+#endif
- 		pr_err("%s: undefined ioctl module\n", __func__);
- 		goto err;
- 	}
- 
- 	/* Check the size of the required cmd table */
- 	i = DB_GET_IOC(cmd);
-+#ifdef CONFIG_BRIDGE_NEW_API
- 	if (i > size_cmd[DB_GET_IOC_TABLE(cmd)]) {
-+#else
-+	if (i >= size_cmd[DB_GET_IOC_TABLE(cmd)]) {
-+#endif
-+
- 		pr_err("%s: requested ioctl %d out of bounds for table %d\n",
- 					__func__, i, DB_GET_IOC_TABLE(cmd));
- 		goto err;