[Patch]: IrDA bugfix: infinite loop in parameter parsing

From: Russell King (rmk@arm.linux.org.uk)
Date: Sat Jul 29 2000 - 04:16:22 EST


Linus,

The following patch fixes an infinite loop in the irda parameter
parsing code. Note that I sent this to the Dag a couple of months
ago for inclusion into 2.4, and have heard nothing since.

I've CC:'d all the relevent people to give them a chance to veto
this change, just in case it wasn't acceptable to them for some
reason.

diff -urN linux-orig/net/irda/parameters.c linux/net/irda/parameters.c
--- linux-orig/net/irda/parameters.c Fri Mar 24 23:19:22 2000
+++ linux/net/irda/parameters.c Fri Jun 30 15:37:28 2000
@@ -513,10 +513,7 @@
                       buf[0]);
                 
                 /* Skip this parameter */
- n += (2 + buf[n+1]);
- len -= (2 + buf[n+1]);
-
- return 0; /* Continue */
+ return 2 + buf[n + 1]; /* Continue */
         }
 
         /* Lookup the info on how to parse this parameter */
@@ -532,10 +529,7 @@
         if (!pi_minor_info->func) {
                 MESSAGE(__FUNCTION__"(), no handler for pi=%#x\n", buf[n]);
                 /* Skip this parameter */
- n += (2 + buf[n+1]);
- len -= (2 + buf[n+1]);
-
- return 0; /* Continue */
+ return 2 + buf[n + 1]; /* Continue */
         }
 
         /* Parse parameter value */

   _____
  |_____| ------------------------------------------------- ---+---+-
  | | Russell King rmk@arm.linux.org.uk --- ---
  | | | | http://www.arm.linux.org.uk/~rmk/aboutme.html / / |
  | +-+-+ --- -+-
  / | THE developer of ARM Linux |+| /|\
 / | | | --- |
    +-+-+ ------------------------------------------------- /\\\ |

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Mon Jul 31 2000 - 21:00:29 EST