[PATCH] drivers/char/tipar.c: off by one array access

[PATCH] drivers/char/tipar.c: off by one array access

[Luc Van Oostenryck]

In the setupt function, the delay variable is initialized with ints[2],
but ints is declared as:
	int ints[2];

Since the module parameter should correspond to:
	tipar=timeout,delay

I suppose that the following patch fix the problem.


Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@looxix.net>

diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c
--- a/drivers/char/tipar.c
+++ b/drivers/char/tipar.c
@@ -407,7 +407,7 @@ tipar_setup(char *str)
                          printk(KERN_WARNING "tipar: bad timeout value (0), "
  				"using default value instead");
  		if (ints[0] > 1) {
-			delay = ints[2];
+			delay = ints[1];
  		}
  	}

Re: [PATCH] drivers/char/tipar.c: off by one array access

[randy_dunlap]

On Sun, 19 Jun 2005 17:15:30 +0200 Luc Van Oostenryck wrote:

| In the setupt function, the delay variable is initialized with ints[2],
| but ints is declared as:
| 	int ints[2];
| 
| Since the module parameter should correspond to:
| 	tipar=timeout,delay
| 
| I suppose that the following patch fix the problem.
| 
| 
| Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@looxix.net>
| 
| diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c
| --- a/drivers/char/tipar.c
| +++ b/drivers/char/tipar.c
| @@ -407,7 +407,7 @@ tipar_setup(char *str)
|                           printk(KERN_WARNING "tipar: bad timeout value (0), "
|   				"using default value instead");
|   		if (ints[0] > 1) {
| -			delay = ints[2];
| +			delay = ints[1];
|   		}
|   	}

That (re)uses the timeout value for delay.
Please try again....

get_options() sets ints[0] to the number of parameters parsed
and tipar_setup() clearly wants to parse as you described:
| 	tipar=timeout,delay
so the ints[] array needs to be [3], not [2].

---
~Randy

Re: [PATCH] drivers/char/tipar.c: off by one array access

[Luc Van Oostenryck]

randy_dunlap wrote:
> On Sun, 19 Jun 2005 17:15:30 +0200 Luc Van Oostenryck wrote:
> 
> | In the setupt function, the delay variable is initialized with ints[2],
> | but ints is declared as:
> | 	int ints[2];
> | 
> | Since the module parameter should correspond to:
> | 	tipar=timeout,delay
> | 
> | I suppose that the following patch fix the problem.

...

> 
> That (re)uses the timeout value for delay.
> Please try again....
> 
> get_options() sets ints[0] to the number of parameters parsed
> and tipar_setup() clearly wants to parse as you described:
> | 	tipar=timeout,delay
> so the ints[] array needs to be [3], not [2].
> 
> ---
> ~Randy

Yes, sorry. Here is another patch.

Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@looxix.net>

diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c
--- a/drivers/char/tipar.c
+++ b/drivers/char/tipar.c
@@ -396,7 +396,7 @@ static struct file_operations tipar_fops
  static int __init
  tipar_setup(char *str)
  {
-	int ints[2];
+	int ints[3];

  	str = get_options(str, ARRAY_SIZE(ints), ints);