r2636 - trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches

[maximilian attems]

Author: maks-guest
Date: 2005-03-07 23:12:29 +0100 (Mon, 07 Mar 2005)
New Revision: 2636

Removed:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/030-moxa_user_copy_checking.dpatch
Log:
remove unneeded patch, alan did better fixes for moxa


Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/030-moxa_user_copy_checking.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/030-moxa_user_copy_checking.dpatch	2005-03-07 16:12:18 UTC (rev 2635)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/030-moxa_user_copy_checking.dpatch	2005-03-07 22:12:29 UTC (rev 2636)
@@ -1,69 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [SECURITY] make the moxa driver check user supplied lengths before doing copy_from_users
-## DP: Patch author: Andres Salomon <dilinger@voxel.net>
-## DP: Upstream status: not yet submitted
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-Revision: linux-drivers-char--moxa-overflow--0--patch-1
-Archive: dilinger@voxel.net--2005-public
-Creator: Andres Salomon <dilinger@voxel.net>
-Date: Fri Jan  7 18:05:38 EST 2005
-Standard-date: 2005-01-07 23:05:38 GMT
-Modified-files: moxa.c
-New-patches: dilinger@voxel.net--2005-public/linux-drivers-char--moxa-overflow--0--patch-1
-Summary: sanity check dltmp.len size before all copy_from_user() calls
-Keywords: 
-
-Make sure the length we're passing copy_from_user() is never negative or
-too large for moxaBuff.
-
-
-
-* modified files
-
---- orig/drivers/char/moxa.c
-+++ mod/drivers/char/moxa.c
-@@ -1666,7 +1666,7 @@
- 
- 	if(copy_from_user(&dltmp, argp, sizeof(struct dl_str)))
- 		return -EFAULT;
--	if(dltmp.cardno < 0 || dltmp.cardno >= MAX_BOARDS)
-+	if(dltmp.cardno < 0 || dltmp.cardno >= MAX_BOARDS || dltmp.len < 0)
- 		return -EINVAL;
- 
- 	switch(cmd)
-@@ -2775,6 +2775,8 @@
- 	void __iomem *baseAddr;
- 	int i;
- 
-+	if(len < 0 || len > sizeof(moxaBuff))
-+		return -EINVAL;
- 	if(copy_from_user(moxaBuff, tmp, len))
- 		return -EFAULT;
- 	baseAddr = moxaBaseAddr[cardno];
-@@ -2822,7 +2824,7 @@
- 	void __iomem *baseAddr;
- 	int i;
- 
--	if(len > sizeof(moxaBuff))
-+	if(len < 0 || len > sizeof(moxaBuff))
- 		return -EINVAL;
- 	if(copy_from_user(moxaBuff, tmp, len))
- 		return -EFAULT;
-@@ -2842,6 +2844,8 @@
- 	void __iomem *baseAddr, *ofsAddr;
- 	int retval, port, i;
- 
-+	if(len < 0 || len > sizeof(moxaBuff))
-+		return -EINVAL;
- 	if(copy_from_user(moxaBuff, tmp, len))
- 		return -EFAULT;
- 	baseAddr = moxaBaseAddr[cardno];
-
-
-