2023-02-04 20:55:41

by Ondrej Zary

Subject: [PATCH] pata_parport: Fix ida_alloc return value error check

pi->dev.id is unsigned so error checking of ida_alloc return value does
not work. Fix it.

Signed-off-by: Ondrej Zary <[email protected]>
---
drivers/ata/pata_parport/pata_parport.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/ata/pata_parport/pata_parport.c b/drivers/ata/pata_parport/pata_parport.c
index 9e8ad93d7e59..294a266a0dda 100644
--- a/drivers/ata/pata_parport/pata_parport.c
+++ b/drivers/ata/pata_parport/pata_parport.c
@@ -424,6 +424,7 @@ static struct pi_adapter *pi_init_one(struct parport *parport,
struct ata_host *host;
struct pi_adapter *pi;
struct pi_device_match match = { .parport = parport, .proto = pr };
+ int id;

/*
* Abort if there's a device already registered on the same parport
@@ -441,9 +442,10 @@ static struct pi_adapter *pi_init_one(struct parport *parport,
pi->dev.bus = &pata_parport_bus_type;
pi->dev.driver = &pr->driver;
pi->dev.release = pata_parport_dev_release;
- pi->dev.id = ida_alloc(&pata_parport_bus_dev_ids, GFP_KERNEL);
- if (pi->dev.id < 0)
+ id = ida_alloc(&pata_parport_bus_dev_ids, GFP_KERNEL);
+ if (id < 0)
return NULL; /* pata_parport_dev_release will do kfree(pi) */
+ pi->dev.id = id;
dev_set_name(&pi->dev, "pata_parport.%u", pi->dev.id);
if (device_register(&pi->dev)) {
put_device(&pi->dev);
--
Ondrej Zary

2023-02-05 19:13:55

by Sergey Shtylyov

Subject: Re: [PATCH] pata_parport: Fix ida_alloc return value error check

Hello!

On 2/4/23 11:55 PM, Ondrej Zary wrote:

> pi->dev.id is unsigned so error checking of ida_alloc return value does
> not work. Fix it.
>
> Signed-off-by: Ondrej Zary <[email protected]>

Reviewed-by: Sergey Shtylyov <[email protected]>

[...]

MBR, Sergey

2023-02-07 00:02:41

by Damien Le Moal

Subject: Re: [PATCH] pata_parport: Fix ida_alloc return value error check

On 2/5/23 05:55, Ondrej Zary wrote:
> pi->dev.id is unsigned so error checking of ida_alloc return value does
> not work. Fix it.
>
> Signed-off-by: Ondrej Zary <[email protected]>

Applied. Thanks !

--
Damien Le Moal
Western Digital Research