[PATCH] nvme: fix bogus kzalloc() return check in nvme_init_effects_log()

[PATCH] nvme: fix bogus kzalloc() return check in nvme_init_effects_log()

[Jens Axboe]

nvme_init_effects_log() returns failure when kzalloc() is successful,
which is obviously wrong and causes failures to boot. Correct the
check.

Fixes: d4a95adeabc6 ("nvme: Add error path for xa_store in nvme_init_effects")
Signed-off-by: Jens Axboe <axboe@kernel.dk>

---

Caused a boot failure on the first test system I tried. Not sure how
this got this far without being seen...

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 9e7f1bb81973..0d21258e2283 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3182,7 +3182,7 @@ static int nvme_init_effects_log(struct nvme_ctrl *ctrl,
 	struct nvme_effects_log *effects, *old;
 
 	effects = kzalloc(sizeof(*effects), GFP_KERNEL);
-	if (effects)
+	if (!effects)
 		return -ENOMEM;
 
 	old = xa_store(&ctrl->cels, csi, effects, GFP_KERNEL);

-- 
Jens Axboe

Re: [PATCH] nvme: fix bogus kzalloc() return check in nvme_init_effects_log()

[Keith Busch]

On Mon, Jan 13, 2025 at 10:30:06AM -0700, Jens Axboe wrote:
> nvme_init_effects_log() returns failure when kzalloc() is successful,
> which is obviously wrong and causes failures to boot. Correct the
> check.
> 
> Fixes: d4a95adeabc6 ("nvme: Add error path for xa_store in nvme_init_effects")
> Signed-off-by: Jens Axboe <axboe@kernel.dk>

Oops. Thanks for the fix

Reviewed-by: Keith Busch <kbusch@kernel.org>

Also applied to nvme-6.14, but feel free to take it directly to
block/for-6.14.

> Caused a boot failure on the first test system I tried. Not sure how
> this got this far without being seen...

I think we've a gap in our blktests for checking driver backward
compatibility. The devices we test against support the Effects log, so
we didn't see this fallback path for older spec revision devices tested
out.

Re: [PATCH] nvme: fix bogus kzalloc() return check in nvme_init_effects_log()

[Keisuke Nishimura]

On 13/01/2025 18:30, Jens Axboe wrote:
> nvme_init_effects_log() returns failure when kzalloc() is successful,
> which is obviously wrong and causes failures to boot. Correct the
> check.

Sorry, I should have checked more carefully here... Thank you for this fix.

Keisuke

> 
> Fixes: d4a95adeabc6 ("nvme: Add error path for xa_store in nvme_init_effects")
> Signed-off-by: Jens Axboe <axboe@kernel.dk>
> 
> ---
> 
> Caused a boot failure on the first test system I tried. Not sure how
> this got this far without being seen...
> 
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index 9e7f1bb81973..0d21258e2283 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -3182,7 +3182,7 @@ static int nvme_init_effects_log(struct nvme_ctrl *ctrl,
>   	struct nvme_effects_log *effects, *old;
>   
>   	effects = kzalloc(sizeof(*effects), GFP_KERNEL);
> -	if (effects)
> +	if (!effects)
>   		return -ENOMEM;
>   
>   	old = xa_store(&ctrl->cels, csi, effects, GFP_KERNEL);
> 

Re: [PATCH] nvme: fix bogus kzalloc() return check in nvme_init_effects_log()

[Jens Axboe]

On 1/13/25 10:39 AM, Keith Busch wrote:
> On Mon, Jan 13, 2025 at 10:30:06AM -0700, Jens Axboe wrote:
>> nvme_init_effects_log() returns failure when kzalloc() is successful,
>> which is obviously wrong and causes failures to boot. Correct the
>> check.
>>
>> Fixes: d4a95adeabc6 ("nvme: Add error path for xa_store in nvme_init_effects")
>> Signed-off-by: Jens Axboe <axboe@kernel.dk>
> 
> Oops. Thanks for the fix
> 
> Reviewed-by: Keith Busch <kbusch@kernel.org>
> 
> Also applied to nvme-6.14, but feel free to take it directly to
> block/for-6.14.

I did, figured that was easier. And if it fails on the one test system
I tested on, guessing it'd break someone using linux-next as well. Hence
let's just shove it in and move on.

-- 
Jens Axboe

Re: [PATCH] nvme: fix bogus kzalloc() return check in nvme_init_effects_log()

[Chaitanya Kulkarni]

On 1/13/25 09:30, Jens Axboe wrote:
> nvme_init_effects_log() returns failure when kzalloc() is successful,
> which is obviously wrong and causes failures to boot. Correct the
> check.
>
> Fixes: d4a95adeabc6 ("nvme: Add error path for xa_store in nvme_init_effects")
> Signed-off-by: Jens Axboe<axboe@kernel.dk>

Looks good.

Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>

-ck

Re: [PATCH] nvme: fix bogus kzalloc() return check in nvme_init_effects_log()

[Sagi Grimberg]

Reviewed-by: Sagi Grimberg <sagi@grimberg.me>