2014-06-03 21:34:29

by Clement Calmels

Subject: [PATCH] sd: bad return code of init_sd

In init_sd function, if kmem_cache_create or mempool_create_slab_pools
calls fail, the error will not be correclty reported because
class_register previously set the value of err to 0.

Signed-off-by: Clément Calmels <[email protected]>
---
drivers/scsi/sd.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index e9689d5..7daa2aa 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3205,12 +3205,14 @@ static int __init init_sd(void)
0, 0, NULL);
if (!sd_cdb_cache) {
printk(KERN_ERR "sd: can't init extended cdb cache\n");
+ err = -ENOMEM;
goto err_out_class;
}

sd_cdb_pool = mempool_create_slab_pool(SD_MEMPOOL_SIZE, sd_cdb_cache);
if (!sd_cdb_pool) {
printk(KERN_ERR "sd: can't init extended cdb pool\n");
+ err = -ENOMEM;
goto err_out_cache;
}

--
2.0.0

2014-06-04 16:44:31

by Ewan Milne

Subject: Re: [PATCH] sd: bad return code of init_sd

On Tue, 2014-06-03 at 23:34 +0200, Clément Calmels wrote:
> In init_sd function, if kmem_cache_create or mempool_create_slab_pools
> calls fail, the error will not be correclty reported because
> class_register previously set the value of err to 0.
>
> Signed-off-by: Clément Calmels <[email protected]>
> ---
> drivers/scsi/sd.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
> index e9689d5..7daa2aa 100644
> --- a/drivers/scsi/sd.c
> +++ b/drivers/scsi/sd.c
> @@ -3205,12 +3205,14 @@ static int __init init_sd(void)
> 0, 0, NULL);
> if (!sd_cdb_cache) {
> printk(KERN_ERR "sd: can't init extended cdb cache\n");
> + err = -ENOMEM;
> goto err_out_class;
> }
>
> sd_cdb_pool = mempool_create_slab_pool(SD_MEMPOOL_SIZE, sd_cdb_cache);
> if (!sd_cdb_pool) {
> printk(KERN_ERR "sd: can't init extended cdb pool\n");
> + err = -ENOMEM;
> goto err_out_cache;
> }
>

I posted this same patch on 2/14/2013. Thanks for reminding me!

Reviewed-by: Ewan D. Milne <[email protected]>

2014-06-11 12:10:21

by Christoph Hellwig

Subject: Re: [PATCH] sd: bad return code of init_sd

Looks good,

Reviewed-by: Christoph Hellwig <[email protected]>