From: Jarkko Sakkinen jarkko@kernel.org
[ Upstream commit d4640c394f23b202a89512346cf28f6622a49031 ]
The current implementation of timeout detection works in the following way:
1. Read completion status. If completed, return the data 2. Sleep for some time (usleep_range) 3. Check for timeout using current jiffies value. Return an error if timed out 4. Goto 1
usleep_range doesn't guarantee it's always going to wake up strictly in (min, max) range, so such a situation is possible:
1. Driver reads completion status. No completion yet 2. Process sleeps indefinitely. In the meantime, TPM responds 3. We check for timeout without checking for the completion again. Result is lost.
Such a situation also happens for the guest VMs: if vCPU goes to sleep and doesn't get scheduled for some time, the guest TPM driver will timeout instantly after waking up without checking for the completion (which may already be in place).
Perform the completion check once again after exiting the busy loop in order to give the device the last chance to send us some data.
Since now we check for completion in two places, extract this check into a separate function.
Signed-off-by: Ivan Orlov ivan.orlov0322@gmail.com Reviewed-by: Jonathan McDowell noodles@meta.com Signed-off-by: Jarkko Sakkinen jarkko@kernel.org Signed-off-by: Sasha Levin sashal@kernel.org ---
LLM Generated explanations, may be completely bogus:
Now let me analyze the code changes in detail to understand the race condition being fixed.
**Backport Status: YES**
This commit should be backported to stable kernel trees. Here's my extensive analysis:
## Bug Analysis
The commit fixes a critical race condition in the TPM driver's timeout handling mechanism that can cause data loss. The bug occurs in the following scenario:
1. **The Race Window**: Between the last completion status check in the busy loop (line 149-151 in the original code) and the timeout check (line 160), there's a window where: - The driver checks status and finds no completion - The process sleeps via `tpm_msleep(TPM_TIMEOUT_POLL)` - During sleep, the TPM device completes the operation - When the process wakes up, `time_before(jiffies, stop)` returns false - The driver immediately returns `-ETIME` without checking completion again
2. **VM-Specific Impact**: The commit message specifically mentions this affects virtual machines where vCPUs can be descheduled for extended periods. When the vCPU resumes, the timeout may have expired while the TPM response is actually ready.
## Code Changes Analysis
The fix involves:
1. **New Helper Function** (lines 85-90): `tpm_transmit_completed()` extracts the completion check logic into a reusable function: ```c static bool tpm_transmit_completed(u8 status, struct tpm_chip *chip) { u8 status_masked = status & chip->ops->req_complete_mask; return status_masked == chip->ops->req_complete_val; } ```
2. **Additional Completion Check** (lines 162-167): After the timeout loop exits, the code now performs one final completion check: ```c /* - Check for completion one more time, just in case the device reported - it while the driver was sleeping in the busy loop above. */ if (tpm_transmit_completed(tpm_chip_status(chip), chip)) goto out_recv; ```
## Stable Backport Criteria Analysis
1. **Fixes a real bug**: ✓ - This fixes a race condition that causes TPM operations to fail spuriously 2. **User impact**: ✓ - TPM operations failing due to this race can affect: - System boot (TPM measurements) - Cryptographic operations - Attestation services - Secure boot processes 3. **Small and contained**: ✓ - The fix is minimal: - Adds one helper function - Adds one additional check after the loop - No architectural changes 4. **Low regression risk**: ✓ - The additional check only runs when timeout occurs, adding minimal overhead 5. **No new features**: ✓ - Only fixes existing functionality 6. **Critical subsystem**: ✓ - TPM is security-critical infrastructure
## Additional Considerations
- The fix is particularly important for virtualized environments where scheduling delays are common - The race condition can cause intermittent failures that are difficult to debug - The fix follows the principle of "check one more time" which is a common pattern for avoiding race conditions - No follow-up fixes were needed for this commit, indicating it's stable
This commit meets all the criteria for stable backporting and addresses a real-world bug that affects system reliability, especially in virtualized environments.
drivers/char/tpm/tpm-interface.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index 8d7e4da6ed53..8d18b33aa62d 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -82,6 +82,13 @@ static bool tpm_chip_req_canceled(struct tpm_chip *chip, u8 status) return chip->ops->req_canceled(chip, status); }
+static bool tpm_transmit_completed(u8 status, struct tpm_chip *chip) +{ + u8 status_masked = status & chip->ops->req_complete_mask; + + return status_masked == chip->ops->req_complete_val; +} + static ssize_t tpm_try_transmit(struct tpm_chip *chip, void *buf, size_t bufsiz) { struct tpm_header *header = buf; @@ -129,8 +136,7 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip, void *buf, size_t bufsiz) stop = jiffies + tpm_calc_ordinal_duration(chip, ordinal); do { u8 status = tpm_chip_status(chip); - if ((status & chip->ops->req_complete_mask) == - chip->ops->req_complete_val) + if (tpm_transmit_completed(status, chip)) goto out_recv;
if (tpm_chip_req_canceled(chip, status)) { @@ -142,6 +148,13 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip, void *buf, size_t bufsiz) rmb(); } while (time_before(jiffies, stop));
+ /* + * Check for completion one more time, just in case the device reported + * it while the driver was sleeping in the busy loop above. + */ + if (tpm_transmit_completed(tpm_chip_status(chip), chip)) + goto out_recv; + tpm_chip_cancel(chip); dev_err(&chip->dev, "Operation Timed out\n"); return -ETIME;