patch-2.4.27 linux-2.4.27/drivers/zorro/proc.c

• Lines: 23
• Date: 2004-08-07 16:26:05.960400441 -0700
• Orig file: linux-2.4.26/drivers/zorro/proc.c
• Orig date: 2002-11-28 15:53:15.000000000 -0800

diff -urN linux-2.4.26/drivers/zorro/proc.c linux-2.4.27/drivers/zorro/proc.c
@@ -50,11 +50,9 @@
 	struct ConfigDev cd;
 	loff_t pos = *ppos;
 
-	if (pos >= sizeof(struct ConfigDev))
+	if (pos < 0 || pos >= sizeof(struct ConfigDev))
 		return 0;
-	if (nbytes >= sizeof(struct ConfigDev))
-		nbytes = sizeof(struct ConfigDev);
-	if (pos + nbytes > sizeof(struct ConfigDev))
+	if (nbytes > sizeof(struct ConfigDev) - pos)
 		nbytes = sizeof(struct ConfigDev) - pos;
 
 	/* Construct a ConfigDev */
@@ -67,7 +65,7 @@
 
 	if (copy_to_user(buf, &cd, nbytes))
 		return -EFAULT;
-	*ppos += nbytes;
+	*ppos = pos + nbytes;
 
 	return nbytes;
 }