Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 A4CBD46E012; Tue, 21 Jul 2026 18:36:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784659012; cv=none; b=S3h1glLYnm6hoUG5LE8vBb3nH2zxL8Uz6BFNKEkBlaY/FyvSoNjVzIJeb91raE1wTh6XWO2Zc5sgzo3OCDBIllPDIUwW3MVCZuDeOl8PIXjjBc1vno21HQvV8DQ+yLucoGnmRfJAPsrroYQMaIG1agNfIjnNJ+MBkg4TqVM4Aio= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784659012; c=relaxed/simple; bh=6Wi9I0DSLKFXySb47KxL7881VwXCqGGxkFwMcWzxjK4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cyihNlwb4q9we3PmqIkLUfEFxlbrZg9zVA6djQ2Jt3wQ29a8nWtD2WH2ti9912DUkj9GxyGOcmDq4n+CqBrhgauwYcNXyRPe1mZaP/TS5SK/AbSS1x9mAq+6g919o9IRY9mfHV45BXV+YYrnCJuTFvLCe9SU4bEEc9790YC3lHc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=L8YcjBUu; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="L8YcjBUu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13F251F000E9; Tue, 21 Jul 2026 18:36:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784659011; bh=SPb7rPxnkJNiYwV9lQNthFPzgX16DkDWZMfU0RDuLtg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=L8YcjBUuV3er2hSQlCpzWtxXvbHPnXZdaPTuexW3Gm/11MMuaxfdvMp1txv9OzsZf jatLKjlZ6Y65Tqw+onnegWP19rQV01vyGzGj2bImssBMy0bXWni9leUom4jlkvnmPp IRil2TGkI9sTwKhBNaubWtY/9OdbM3CFM5znhP+E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mikulas Patocka Subject: [PATCH 6.18 1361/1611] dm-verity: make error counter atomic Date: Tue, 21 Jul 2026 17:24:37 +0200 Message-ID: <20260721152546.067085883@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mikulas Patocka commit 8ec4d9c5a5cf4b61fc087f871465b1f79b393325 upstream. The error counter "v->corrupted_errs" was not atomic, thus it could be subject to race conditions. The call to dm_audit_log_target("max-corrupted-errors") may be skipped due to the races. Signed-off-by: Mikulas Patocka Assisted-by: Claude:claude-opus-4.6 Fixes: 65ff5b7ddf05 ("dm verity: add error handling modes for corrupted blocks") Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/md/dm-verity-target.c | 12 +++++++----- drivers/md/dm-verity.h | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) --- a/drivers/md/dm-verity-target.c +++ b/drivers/md/dm-verity-target.c @@ -165,14 +165,16 @@ static int verity_handle_err(struct dm_v char *envp[] = { verity_env, NULL }; const char *type_str = ""; struct mapped_device *md = dm_table_get_md(v->ti->table); + int ce; /* Corruption should be visible in device status in all modes */ v->hash_failed = true; - if (v->corrupted_errs >= DM_VERITY_MAX_CORRUPTED_ERRS) - goto out; - - v->corrupted_errs++; + ce = atomic_read(&v->corrupted_errs); + do { + if (ce >= DM_VERITY_MAX_CORRUPTED_ERRS) + goto out; + } while (!atomic_try_cmpxchg(&v->corrupted_errs, &ce, ce + 1)); switch (type) { case DM_VERITY_BLOCK_TYPE_DATA: @@ -188,7 +190,7 @@ static int verity_handle_err(struct dm_v DMERR_LIMIT("%s: %s block %llu is corrupted", v->data_dev->name, type_str, block); - if (v->corrupted_errs == DM_VERITY_MAX_CORRUPTED_ERRS) { + if (ce + 1 == DM_VERITY_MAX_CORRUPTED_ERRS) { DMERR("%s: reached maximum errors", v->data_dev->name); dm_audit_log_target(DM_MSG_PREFIX, "max-corrupted-errors", v->ti, 0); } --- a/drivers/md/dm-verity.h +++ b/drivers/md/dm-verity.h @@ -62,7 +62,7 @@ struct dm_verity { unsigned int digest_size; /* digest size for the current hash algorithm */ enum verity_mode mode; /* mode for handling verification errors */ enum verity_mode error_mode;/* mode for handling I/O errors */ - unsigned int corrupted_errs;/* Number of errors for corrupted blocks */ + atomic_t corrupted_errs;/* Number of errors for corrupted blocks */ struct workqueue_struct *verify_wq;