]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
ata: libata-eh: Fix detection of deferred qc timeouts
authorGuenter Roeck <linux@roeck-us.net>
Fri, 6 Mar 2026 02:48:05 +0000 (18:48 -0800)
committerSasha Levin <sashal@kernel.org>
Thu, 12 Mar 2026 11:10:01 +0000 (07:10 -0400)
commitb5493eb3910bf44835cb46e4aa22ac0bcf772902
treeccbd9261540c13928e4118307f6016ba3ae59235
parent19c72ec795b6d97df39d8271c38b22411e18b18f
ata: libata-eh: Fix detection of deferred qc timeouts

[ Upstream commit ee0e6e69a772d601e152e5368a1da25d656122a8 ]

If the ata_qc_for_each_raw() loop finishes without finding a matching SCSI
command for any QC, the variable qc will hold a pointer to the last element
examined, which has the tag i == ATA_MAX_QUEUE - 1. This qc can match the
port deferred QC (ap->deferred_qc).

If that happens, the condition qc == ap->deferred_qc evaluates to true
despite the loop not breaking with a match on the SCSI command for this QC.
In that case, the error handler mistakenly intercepts a command that has
not been issued yet and that has not timed out, and thus erroneously
returning a timeout error.

Fix the problem by checking for i < ATA_MAX_QUEUE in addition to
qc == ap->deferred_qc.

The problem was found by an experimental code review agent based on
gemini-3.1-pro while reviewing backports into v6.18.y.

Assisted-by: Gemini:gemini-3.1-pro
Fixes: eddb98ad9364 ("ata: libata-eh: correctly handle deferred qc timeouts")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
[cassel: modified commit log as suggested by Damien]
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Niklas Cassel <cassel@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/ata/libata-eh.c