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 <[email protected]>
Assisted-by: Claude:claude-opus-4.6
Fixes: 65ff5b7ddf05 ("dm verity: add error handling modes for corrupted blocks")
Cc: [email protected]

---
 drivers/md/dm-verity-target.c |   12 +++++++-----
 drivers/md/dm-verity.h        |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

Index: linux-2.6/drivers/md/dm-verity-target.c
===================================================================
--- linux-2.6.orig/drivers/md/dm-verity-target.c        2026-07-09 
20:49:00.000000000 +0200
+++ linux-2.6/drivers/md/dm-verity-target.c     2026-07-09 21:01:53.000000000 
+0200
@@ -180,14 +180,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:
@@ -203,7 +205,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);
        }
Index: linux-2.6/drivers/md/dm-verity.h
===================================================================
--- linux-2.6.orig/drivers/md/dm-verity.h       2026-04-27 19:06:34.000000000 
+0200
+++ linux-2.6/drivers/md/dm-verity.h    2026-07-09 20:52:43.000000000 +0200
@@ -68,7 +68,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;
 


Reply via email to