CVE-2024-53102: nvme: make keep-alive synchronous operation

CVE-2024-53102: nvme: make keep-alive synchronous operation

[Greg Kroah-Hartman]

Description
===========

In the Linux kernel, the following vulnerability has been resolved:

nvme: make keep-alive synchronous operation

The nvme keep-alive operation, which executes at a periodic interval,
could potentially sneak in while shutting down a fabric controller.
This may lead to a race between the fabric controller admin queue
destroy code path (invoked while shutting down controller) and hw/hctx
queue dispatcher called from the nvme keep-alive async request queuing
operation. This race could lead to the kernel crash shown below:

Call Trace:
    autoremove_wake_function+0x0/0xbc (unreliable)
    __blk_mq_sched_dispatch_requests+0x114/0x24c
    blk_mq_sched_dispatch_requests+0x44/0x84
    blk_mq_run_hw_queue+0x140/0x220
    nvme_keep_alive_work+0xc8/0x19c [nvme_core]
    process_one_work+0x200/0x4e0
    worker_thread+0x340/0x504
    kthread+0x138/0x140
    start_kernel_thread+0x14/0x18

While shutting down fabric controller, if nvme keep-alive request sneaks
in then it would be flushed off. The nvme_keep_alive_end_io function is
then invoked to handle the end of the keep-alive operation which
decrements the admin->q_usage_counter and assuming this is the last/only
request in the admin queue then the admin->q_usage_counter becomes zero.
If that happens then blk-mq destroy queue operation (blk_mq_destroy_
queue()) which could be potentially running simultaneously on another
cpu (as this is the controller shutdown code path) would forward
progress and deletes the admin queue. So, now from this point onward
we are not supposed to access the admin queue resources. However the
issue here's that the nvme keep-alive thread running hw/hctx queue
dispatch operation hasn't yet finished its work and so it could still
potentially access the admin queue resource while the admin queue had
been already deleted and that causes the above crash.

This fix helps avoid the observed crash by implementing keep-alive as a
synchronous operation so that we decrement admin->q_usage_counter only
after keep-alive command finished its execution and returns the command
status back up to its caller (blk_execute_rq()). This would ensure that
fabric shutdown code path doesn't destroy the fabric admin queue until
keep-alive request finished execution and also keep-alive thread is not
running hw/hctx queue dispatch operation.

The Linux kernel CVE team has assigned CVE-2024-53102 to this issue.


Affected and fixed versions
===========================

	Fixed in 6.1.118 with commit afa229465399
	Fixed in 6.6.62 with commit 1a1bcca5c9ef
	Fixed in 6.11.9 with commit ccc1d82dfaad
	Fixed in 6.12 with commit d06923670b5a

Please see https://www.kernel.org for a full list of currently supported
kernel versions by the kernel community.

Unaffected versions might change over time as fixes are backported to
older supported kernel versions.  The official CVE entry at
	https://cve.org/CVERecord/?id=CVE-2024-53102
will be updated if fixes are backported, please check that for the most
up to date information about this issue.


Affected files
==============

The file(s) affected by this issue are:
	drivers/nvme/host/core.c


Mitigation
==========

The Linux kernel CVE team recommends that you update to the latest
stable kernel version for this, and many other bugfixes.  Individual
changes are never tested alone, but rather are part of a larger kernel
release.  Cherry-picking individual commits is not recommended or
supported by the Linux kernel community at all.  If however, updating to
the latest release is impossible, the individual changes to resolve this
issue can be found at these commits:
	https://git.kernel.org/stable/c/afa229465399f89d3af9d72ced865144c9748846
	https://git.kernel.org/stable/c/1a1bcca5c9efd2c72c8d2fcbadf2d673cceb2ea7
	https://git.kernel.org/stable/c/ccc1d82dfaad0ad27d21139da22e57add73d2a5e
	https://git.kernel.org/stable/c/d06923670b5a5f609603d4a9fee4dec02d38de9c

Re: CVE-2024-53102: nvme: make keep-alive synchronous operation

[Yuxuan Luo]

Hi Greg,

The fix commit for CVE-2024-53102, d06923670b5ia ("nvme: make keep-alive
synchronous operation"), has been reverted by 84488282166d ("Revert "nvme: make
keep-alive synchronous operation"") and the follow-up commit for the fix commit
, e9869c85c811 ("nvme-fabrics: fix kernel crash while shutting down
controller") fixes CVE-2024-45013. Does that mean CVE-2024-53102 has been
invalidated by the revert commit? If so, will you reject CVE-2024-53102?

Re: CVE-2024-53102: nvme: make keep-alive synchronous operation

[Greg KH]

On Wed, Dec 11, 2024 at 02:09:34PM -0500, Yuxuan Luo wrote:
> Hi Greg,
> 
> The fix commit for CVE-2024-53102, d06923670b5ia ("nvme: make keep-alive
> synchronous operation"), has been reverted by 84488282166d ("Revert "nvme: make
> keep-alive synchronous operation"") and the follow-up commit for the fix commit
> , e9869c85c811 ("nvme-fabrics: fix kernel crash while shutting down
> controller") fixes CVE-2024-45013. Does that mean CVE-2024-53102 has been
> invalidated by the revert commit? If so, will you reject CVE-2024-53102?

Now rejected, thanks.

greg k-h