From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3BD891BFE0C for ; Mon, 25 Nov 2024 21:21:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732569710; cv=none; b=HYXjs2CLU06I17HV6YeF4PNTcybOSHnDPU08p2qS2pnbKwEA7Qk62dQ9W0aE+sFHwpRyyV0B+zfCX0teqwaQfnhABIXniJLSN/+JG4rIb2fX7kK4VxOsrN+COgmLtn2EeZCiV2qz9YT6POoSfwfMwnRer2Y0T/6Kub5uDTIsC28= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732569710; c=relaxed/simple; bh=xDngP+VROBGFjIrWxH5bhbmDtQ1ETS7/glBzy7rwgts=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=TEoAGPATAUZRtqyXXR4IY5FbkYCVuA1lxTGK57eQIpmz4pB0hAh17jJc+VVaI+TJ9Jacbxk4PyeBqGdv7z4byiCY9JdHwSTsCh4owa8UA/8/Q0X9qHySpRPfvX0jXJtK2+5z9NlbIg35mOhjWaPIdaJQsSNspADFU9Yft63g1bA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZaKZuiId; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ZaKZuiId" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8A96C4CECE; Mon, 25 Nov 2024 21:21:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1732569710; bh=xDngP+VROBGFjIrWxH5bhbmDtQ1ETS7/glBzy7rwgts=; h=From:To:Cc:Subject:Date:Reply-to:From; b=ZaKZuiIdRiThFyt4M/k/cX+yPnxHyO1ijTToyCSy2FJjws1l5+Qi2DwjMA7PwsLST I33cH3OtYrORDU6Um+/SfOJxJf+hB4rxW5HjpSfac19AJ5oKCHK6DYcKoBoTpDp5o2 i937VgAi81EDoXrI4Sb2hoLb/hZfirJJ95Vgo7aU= From: Greg Kroah-Hartman To: linux-cve-announce@vger.kernel.org Cc: Greg Kroah-Hartman Subject: CVE-2024-53102: nvme: make keep-alive synchronous operation Date: Mon, 25 Nov 2024 22:21:11 +0100 Message-ID: <2024112507-CVE-2024-53102-a45c@gregkh> X-Mailer: git-send-email 2.47.0 Precedence: bulk X-Mailing-List: linux-cve-announce@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reply-to: , X-Developer-Signature: v=1; a=openpgp-sha256; l=4013; i=gregkh@linuxfoundation.org; h=from:subject:message-id; bh=xDngP+VROBGFjIrWxH5bhbmDtQ1ETS7/glBzy7rwgts=; b=owGbwMvMwCRo6H6F97bub03G02pJDOkur5yT9xg4b/ORCFn6ucrmzLMDqrVFFkaK2mnH+SZZx zBqik/uiGVhEGRikBVTZPmyjefo/opDil6Gtqdh5rAygQxh4OIUgInEnmSYZ3aBpbOy9NQPoR2G 8stsHn+aFV9VxzDP6ub+tvRDAr5yFmc/bddM1HSui/gGAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 Content-Transfer-Encoding: 8bit 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