linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 1/3] Input: db9 - store object at correct index
@ 2015-10-03  9:24 Sudip Mukherjee
  2015-10-03  9:24 ` [PATCH v2 2/3] Input: gamecon " Sudip Mukherjee
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Sudip Mukherjee @ 2015-10-03  9:24 UTC (permalink / raw)
  To: Dmitry Torokhov; +Cc: linux-kernel, linux-input, Sudip Mukherjee

The variable i is used to check the port to attach to and we are
supposed to save the reference of struct db9 in the location given by
db9_base[i]. But after finding out the index, i is getting modified again
so we saved in a wrong index.
While at it mark db9_base[i] as NULL after it is freed.

Fixes: 2260c419b52b ("Input: db9 - use parallel port device model")
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 drivers/input/joystick/db9.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index cf1f602..932d073 100644
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -560,25 +560,25 @@ static void db9_attach(struct parport *pp)
 	const struct db9_mode_data *db9_mode;
 	struct pardevice *pd;
 	struct input_dev *input_dev;
-	int i, j;
+	int i, j, port_idx;
 	int mode;
 	struct pardev_cb db9_parport_cb;
 
-	for (i = 0; i < DB9_MAX_PORTS; i++) {
-		if (db9_cfg[i].nargs == 0 ||
-		    db9_cfg[i].args[DB9_ARG_PARPORT] < 0)
+	for (port_idx = 0; port_idx < DB9_MAX_PORTS; port_idx++) {
+		if (db9_cfg[port_idx].nargs == 0 ||
+		    db9_cfg[port_idx].args[DB9_ARG_PARPORT] < 0)
 			continue;
 
-		if (db9_cfg[i].args[DB9_ARG_PARPORT] == pp->number)
+		if (db9_cfg[port_idx].args[DB9_ARG_PARPORT] == pp->number)
 			break;
 	}
 
-	if (i == DB9_MAX_PORTS) {
+	if (port_idx == DB9_MAX_PORTS) {
 		pr_debug("Not using parport%d.\n", pp->number);
 		return;
 	}
 
-	mode = db9_cfg[i].args[DB9_ARG_MODE];
+	mode = db9_cfg[port_idx].args[DB9_ARG_MODE];
 
 	if (mode < 1 || mode >= DB9_MAX_PAD || !db9_modes[mode].n_buttons) {
 		printk(KERN_ERR "db9.c: Bad device type %d\n", mode);
@@ -594,7 +594,7 @@ static void db9_attach(struct parport *pp)
 
 	db9_parport_cb.flags = PARPORT_FLAG_EXCL;
 
-	pd = parport_register_dev_model(pp, "db9", &db9_parport_cb, i);
+	pd = parport_register_dev_model(pp, "db9", &db9_parport_cb, port_idx);
 	if (!pd) {
 		printk(KERN_ERR "db9.c: parport busy already - lp.o loaded?\n");
 		return;
@@ -649,7 +649,7 @@ static void db9_attach(struct parport *pp)
 			goto err_free_dev;
 	}
 
-	db9_base[i] = db9;
+	db9_base[port_idx] = db9;
 	return;
 
  err_free_dev:
@@ -676,6 +676,7 @@ static void db9_detach(struct parport *port)
 		return;
 
 	db9 = db9_base[i];
+	db9_base[i] = NULL;
 
 	for (i = 0; i < min(db9_modes[db9->mode].n_pads, DB9_MAX_DEVICES); i++)
 		input_unregister_device(db9->dev[i]);
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH v2 2/3] Input: gamecon - store object at correct index
  2015-10-03  9:24 [PATCH v2 1/3] Input: db9 - store object at correct index Sudip Mukherjee
@ 2015-10-03  9:24 ` Sudip Mukherjee
  2015-10-03  9:24 ` [PATCH v2 3/3] Input: turbografx - store object in " Sudip Mukherjee
  2015-10-06  0:32 ` [PATCH v2 1/3] Input: db9 - store object at " Dmitry Torokhov
  2 siblings, 0 replies; 6+ messages in thread
From: Sudip Mukherjee @ 2015-10-03  9:24 UTC (permalink / raw)
  To: Dmitry Torokhov; +Cc: linux-kernel, linux-input, Sudip Mukherjee, Dan Carpenter

The variable i is used to check the port to attach to and we are
supposed to save the reference of struct gc in the location given by
gc_base[i]. But after finding out the index, i is getting modified again
so we saved in a wrong index.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: a517e87c3dfc ("Input: gamecon - use parallel port device model")
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 drivers/input/joystick/gamecon.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index 394ccbe..5a672dc 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -931,29 +931,30 @@ static void gc_attach(struct parport *pp)
 {
 	struct gc *gc;
 	struct pardevice *pd;
-	int i;
+	int i, port_idx;
 	int count = 0;
 	int *pads, n_pads;
 	struct pardev_cb gc_parport_cb;
 
-	for (i = 0; i < GC_MAX_PORTS; i++) {
-		if (gc_cfg[i].nargs == 0 || gc_cfg[i].args[0] < 0)
+	for (port_idx = 0; port_idx < GC_MAX_PORTS; port_idx++) {
+		if (gc_cfg[port_idx].nargs == 0 || gc_cfg[port_idx].args[0] < 0)
 			continue;
 
-		if (gc_cfg[i].args[0] == pp->number)
+		if (gc_cfg[port_idx].args[0] == pp->number)
 			break;
 	}
 
-	if (i == GC_MAX_PORTS) {
+	if (port_idx == GC_MAX_PORTS) {
 		pr_debug("Not using parport%d.\n", pp->number);
 		return;
 	}
-	pads = gc_cfg[i].args + 1;
-	n_pads = gc_cfg[i].nargs - 1;
+	pads = gc_cfg[port_idx].args + 1;
+	n_pads = gc_cfg[port_idx].nargs - 1;
 
 	gc_parport_cb.flags = PARPORT_FLAG_EXCL;
 
-	pd = parport_register_dev_model(pp, "gamecon", &gc_parport_cb, i);
+	pd = parport_register_dev_model(pp, "gamecon", &gc_parport_cb,
+					port_idx);
 	if (!pd) {
 		pr_err("parport busy already - lp.o loaded?\n");
 		return;
@@ -985,7 +986,7 @@ static void gc_attach(struct parport *pp)
 		goto err_free_gc;
 	}
 
-	gc_base[i] = gc;
+	gc_base[port_idx] = gc;
 	return;
 
  err_unreg_devs:
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH v2 3/3] Input: turbografx - store object in correct index
  2015-10-03  9:24 [PATCH v2 1/3] Input: db9 - store object at correct index Sudip Mukherjee
  2015-10-03  9:24 ` [PATCH v2 2/3] Input: gamecon " Sudip Mukherjee
@ 2015-10-03  9:24 ` Sudip Mukherjee
  2015-10-06  0:32 ` [PATCH v2 1/3] Input: db9 - store object at " Dmitry Torokhov
  2 siblings, 0 replies; 6+ messages in thread
From: Sudip Mukherjee @ 2015-10-03  9:24 UTC (permalink / raw)
  To: Dmitry Torokhov; +Cc: linux-kernel, linux-input, Sudip Mukherjee

The variable i is used to check the port to attach to and we are
supposed to save the reference of struct tgfx in the location given by
tgfx_base[i]. But after finding out the index, i is getting modified
again so we saved in a wrong index.

Fixes: 4de27a638a99 ("Input: turbografx - use parallel port device model")
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 drivers/input/joystick/turbografx.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c
index 01e8ea9..9f5bca2 100644
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
@@ -162,27 +162,29 @@ static void tgfx_attach(struct parport *pp)
 	struct tgfx *tgfx;
 	struct input_dev *input_dev;
 	struct pardevice *pd;
-	int i, j;
+	int i, j, port_idx;
 	int *n_buttons, n_devs;
 	struct pardev_cb tgfx_parport_cb;
 
-	for (i = 0; i < TGFX_MAX_PORTS; i++) {
-		if (tgfx_cfg[i].nargs == 0 || tgfx_cfg[i].args[0] < 0)
+	for (port_idx = 0; port_idx < TGFX_MAX_PORTS; port_idx++) {
+		if (tgfx_cfg[port_idx].nargs == 0 ||
+		    tgfx_cfg[port_idx].args[0] < 0)
 			continue;
-		if (tgfx_cfg[i].args[0] == pp->number)
+		if (tgfx_cfg[port_idx].args[0] == pp->number)
 			break;
 	}
 
-	if (i == TGFX_MAX_PORTS) {
+	if (port_idx == TGFX_MAX_PORTS) {
 		pr_debug("Not using parport%d.\n", pp->number);
 		return;
 	}
-	n_buttons = tgfx_cfg[i].args + 1;
-	n_devs = tgfx_cfg[i].nargs - 1;
+	n_buttons = tgfx_cfg[port_idx].args + 1;
+	n_devs = tgfx_cfg[port_idx].nargs - 1;
 
 	tgfx_parport_cb.flags = PARPORT_FLAG_EXCL;
 
-	pd = parport_register_dev_model(pp, "turbografx", &tgfx_parport_cb, i);
+	pd = parport_register_dev_model(pp, "turbografx", &tgfx_parport_cb,
+					port_idx);
 	if (!pd) {
 		pr_err("parport busy already - lp.o loaded?\n");
 		return;
@@ -250,7 +252,7 @@ static void tgfx_attach(struct parport *pp)
 		goto err_free_tgfx;
         }
 
-	tgfx_base[i] = tgfx;
+	tgfx_base[port_idx] = tgfx;
 	return;
 
  err_free_dev:
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/3] Input: db9 - store object at correct index
  2015-10-03  9:24 [PATCH v2 1/3] Input: db9 - store object at correct index Sudip Mukherjee
  2015-10-03  9:24 ` [PATCH v2 2/3] Input: gamecon " Sudip Mukherjee
  2015-10-03  9:24 ` [PATCH v2 3/3] Input: turbografx - store object in " Sudip Mukherjee
@ 2015-10-06  0:32 ` Dmitry Torokhov
  2015-10-06  5:38   ` Sudip Mukherjee
  2 siblings, 1 reply; 6+ messages in thread
From: Dmitry Torokhov @ 2015-10-06  0:32 UTC (permalink / raw)
  To: Sudip Mukherjee; +Cc: linux-kernel, linux-input

On Sat, Oct 03, 2015 at 02:54:56PM +0530, Sudip Mukherjee wrote:
> The variable i is used to check the port to attach to and we are
> supposed to save the reference of struct db9 in the location given by
> db9_base[i]. But after finding out the index, i is getting modified again
> so we saved in a wrong index.
> While at it mark db9_base[i] as NULL after it is freed.
> 
> Fixes: 2260c419b52b ("Input: db9 - use parallel port device model")
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>

Applied the lot, thank you.

> ---
>  drivers/input/joystick/db9.c | 19 ++++++++++---------
>  1 file changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
> index cf1f602..932d073 100644
> --- a/drivers/input/joystick/db9.c
> +++ b/drivers/input/joystick/db9.c
> @@ -560,25 +560,25 @@ static void db9_attach(struct parport *pp)
>  	const struct db9_mode_data *db9_mode;
>  	struct pardevice *pd;
>  	struct input_dev *input_dev;
> -	int i, j;
> +	int i, j, port_idx;
>  	int mode;
>  	struct pardev_cb db9_parport_cb;
>  
> -	for (i = 0; i < DB9_MAX_PORTS; i++) {
> -		if (db9_cfg[i].nargs == 0 ||
> -		    db9_cfg[i].args[DB9_ARG_PARPORT] < 0)
> +	for (port_idx = 0; port_idx < DB9_MAX_PORTS; port_idx++) {
> +		if (db9_cfg[port_idx].nargs == 0 ||
> +		    db9_cfg[port_idx].args[DB9_ARG_PARPORT] < 0)
>  			continue;
>  
> -		if (db9_cfg[i].args[DB9_ARG_PARPORT] == pp->number)
> +		if (db9_cfg[port_idx].args[DB9_ARG_PARPORT] == pp->number)
>  			break;
>  	}
>  
> -	if (i == DB9_MAX_PORTS) {
> +	if (port_idx == DB9_MAX_PORTS) {
>  		pr_debug("Not using parport%d.\n", pp->number);
>  		return;
>  	}
>  
> -	mode = db9_cfg[i].args[DB9_ARG_MODE];
> +	mode = db9_cfg[port_idx].args[DB9_ARG_MODE];
>  
>  	if (mode < 1 || mode >= DB9_MAX_PAD || !db9_modes[mode].n_buttons) {
>  		printk(KERN_ERR "db9.c: Bad device type %d\n", mode);
> @@ -594,7 +594,7 @@ static void db9_attach(struct parport *pp)
>  
>  	db9_parport_cb.flags = PARPORT_FLAG_EXCL;
>  
> -	pd = parport_register_dev_model(pp, "db9", &db9_parport_cb, i);
> +	pd = parport_register_dev_model(pp, "db9", &db9_parport_cb, port_idx);
>  	if (!pd) {
>  		printk(KERN_ERR "db9.c: parport busy already - lp.o loaded?\n");
>  		return;
> @@ -649,7 +649,7 @@ static void db9_attach(struct parport *pp)
>  			goto err_free_dev;
>  	}
>  
> -	db9_base[i] = db9;
> +	db9_base[port_idx] = db9;
>  	return;
>  
>   err_free_dev:
> @@ -676,6 +676,7 @@ static void db9_detach(struct parport *port)
>  		return;
>  
>  	db9 = db9_base[i];
> +	db9_base[i] = NULL;
>  
>  	for (i = 0; i < min(db9_modes[db9->mode].n_pads, DB9_MAX_DEVICES); i++)
>  		input_unregister_device(db9->dev[i]);
> -- 
> 1.9.1
> 

-- 
Dmitry

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/3] Input: db9 - store object at correct index
  2015-10-06  0:32 ` [PATCH v2 1/3] Input: db9 - store object at " Dmitry Torokhov
@ 2015-10-06  5:38   ` Sudip Mukherjee
  2015-10-06 22:35     ` Dmitry Torokhov
  0 siblings, 1 reply; 6+ messages in thread
From: Sudip Mukherjee @ 2015-10-06  5:38 UTC (permalink / raw)
  To: Dmitry Torokhov; +Cc: linux-kernel, linux-input

On Mon, Oct 05, 2015 at 05:32:05PM -0700, Dmitry Torokhov wrote:
> On Sat, Oct 03, 2015 at 02:54:56PM +0530, Sudip Mukherjee wrote:
> > The variable i is used to check the port to attach to and we are
> > supposed to save the reference of struct db9 in the location given by
> > db9_base[i]. But after finding out the index, i is getting modified again
> > so we saved in a wrong index.
> > While at it mark db9_base[i] as NULL after it is freed.
> > 
> > Fixes: 2260c419b52b ("Input: db9 - use parallel port device model")
> > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> 
> Applied the lot, thank you.

Thanks. And the change for serio/parkbd was pending. You said it was
clashing with other changs.  Do i need to rebase and send you?

regards
sudip

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/3] Input: db9 - store object at correct index
  2015-10-06  5:38   ` Sudip Mukherjee
@ 2015-10-06 22:35     ` Dmitry Torokhov
  0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2015-10-06 22:35 UTC (permalink / raw)
  To: Sudip Mukherjee; +Cc: linux-kernel, linux-input

On Tue, Oct 06, 2015 at 11:08:59AM +0530, Sudip Mukherjee wrote:
> On Mon, Oct 05, 2015 at 05:32:05PM -0700, Dmitry Torokhov wrote:
> > On Sat, Oct 03, 2015 at 02:54:56PM +0530, Sudip Mukherjee wrote:
> > > The variable i is used to check the port to attach to and we are
> > > supposed to save the reference of struct db9 in the location given by
> > > db9_base[i]. But after finding out the index, i is getting modified again
> > > so we saved in a wrong index.
> > > While at it mark db9_base[i] as NULL after it is freed.
> > > 
> > > Fixes: 2260c419b52b ("Input: db9 - use parallel port device model")
> > > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> > 
> > Applied the lot, thank you.
> 
> Thanks. And the change for serio/parkbd was pending. You said it was
> clashing with other changs.  Do i need to rebase and send you?

No, I applied it now.

Thanks.

-- 
Dmitry

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-10-06 22:35 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-03  9:24 [PATCH v2 1/3] Input: db9 - store object at correct index Sudip Mukherjee
2015-10-03  9:24 ` [PATCH v2 2/3] Input: gamecon " Sudip Mukherjee
2015-10-03  9:24 ` [PATCH v2 3/3] Input: turbografx - store object in " Sudip Mukherjee
2015-10-06  0:32 ` [PATCH v2 1/3] Input: db9 - store object at " Dmitry Torokhov
2015-10-06  5:38   ` Sudip Mukherjee
2015-10-06 22:35     ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).