[PATCH] NVMe: Fix error handling of class_create("nvme")

[PATCH] NVMe: Fix error handling of class_create("nvme")

[Alexey Khoroshilov]

class_create() returns ERR_PTR on failure,
so IS_ERR() should be used instead of check for NULL.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov at ispras.ru>
---
 drivers/block/nvme-core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index ceb32dd52a6c..30ac50b3009d 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -3165,8 +3165,10 @@ static int __init nvme_init(void)
 		nvme_char_major = result;
 
 	nvme_class = class_create(THIS_MODULE, "nvme");
-	if (!nvme_class)
+	if (IS_ERR(nvme_class)) {
+		result = PTR_ERR(nvme_class);
 		goto unregister_chrdev;
+	}
 
 	result = pci_register_driver(&nvme_driver);
 	if (result)
-- 
1.9.1

[PATCH] NVMe: Fix error handling of class_create("nvme")

[J Freyensee]

On Sat, 2015-03-07@01:43 +0300, Alexey Khoroshilov wrote:
> class_create() returns ERR_PTR on failure,
> so IS_ERR() should be used instead of check for NULL.
> 
> Found by Linux Driver Verification project (linuxtesting.org).
> 
> Signed-off-by: Alexey Khoroshilov <khoroshilov at ispras.ru>
> ---
>  drivers/block/nvme-core.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
> index ceb32dd52a6c..30ac50b3009d 100644
> --- a/drivers/block/nvme-core.c
> +++ b/drivers/block/nvme-core.c
> @@ -3165,8 +3165,10 @@ static int __init nvme_init(void)
>  		nvme_char_major = result;
>  
>  	nvme_class = class_create(THIS_MODULE, "nvme");
> -	if (!nvme_class)
> +	if (IS_ERR(nvme_class)) {

Looking at IS_ERR(), it uses IS_ERR_VALUE() which uses unlikely(), which
from what I understand is a compiler hint that means "this error is
unlikely to happen".

Well, is this error unlikely to happen?  Looks like the error could be
caused by kzalloc() failing, which could more likely happen in a
low-cost Chromebook OS laptop (nvme boot driver just got accepted into
the OS). Or a number of other things going wrong within the
__class_register() call.

Without understanding the code in fine-print detail, it seems like how
'nvme_class' condition is checked can be a bit arbitrary.

> +		result = PTR_ERR(nvme_class);
>  		goto unregister_chrdev;
> +	}
>  
>  	result = pci_register_driver(&nvme_driver);
>  	if (result)

[PATCH] NVMe: Fix error handling of class_create("nvme")

[Matthew Wilcox]

On Tue, Mar 10, 2015@12:18:22PM -0700, J Freyensee wrote:
> Looking at IS_ERR(), it uses IS_ERR_VALUE() which uses unlikely(), which
> from what I understand is a compiler hint that means "this error is
> unlikely to happen".
> 
> Well, is this error unlikely to happen?  Looks like the error could be

Yes.  All errors are, by definition, unlikely to happen.

[PATCH] NVMe: Fix error handling of class_create("nvme")

[Keith Busch]

On Fri, 6 Mar 2015, Alexey Khoroshilov wrote:
> class_create() returns ERR_PTR on failure,
> so IS_ERR() should be used instead of check for NULL.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Alexey Khoroshilov <khoroshilov at ispras.ru>

Thanks for the fix.

Acked-by: Keith Busch <keith.busch at intel.com>

[PATCH] NVMe: Fix error handling of class_create("nvme")

[Keith Busch]

On Fri, 6 Mar 2015, Alexey Khoroshilov wrote:
> class_create() returns ERR_PTR on failure,
> so IS_ERR() should be used instead of check for NULL.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Alexey Khoroshilov <khoroshilov at ispras.ru>

Just resending ack for 4.1.

Acked-by: Keith Busch <keith.busch at intel.com>

> ---
> drivers/block/nvme-core.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
> index ceb32dd52a6c..30ac50b3009d 100644
> --- a/drivers/block/nvme-core.c
> +++ b/drivers/block/nvme-core.c
> @@ -3165,8 +3165,10 @@ static int __init nvme_init(void)
> 		nvme_char_major = result;
>
> 	nvme_class = class_create(THIS_MODULE, "nvme");
> -	if (!nvme_class)
> +	if (IS_ERR(nvme_class)) {
> +		result = PTR_ERR(nvme_class);
> 		goto unregister_chrdev;
> +	}
>
> 	result = pci_register_driver(&nvme_driver);
> 	if (result)
> -- 
> 1.9.1

[PATCH] NVMe: Fix error handling of class_create("nvme")

[Jens Axboe]

On 04/07/2015 05:03 PM, Keith Busch wrote:
> On Fri, 6 Mar 2015, Alexey Khoroshilov wrote:
>> class_create() returns ERR_PTR on failure,
>> so IS_ERR() should be used instead of check for NULL.
>>
>> Found by Linux Driver Verification project (linuxtesting.org).
>>
>> Signed-off-by: Alexey Khoroshilov <khoroshilov at ispras.ru>
>
> Just resending ack for 4.1.
>
> Acked-by: Keith Busch <keith.busch at intel.com>

Thanks, I missed this one. Applied to for-4.1/drivers, thanks!

-- 
Jens Axboe