[PATCH 1/2] Revert: "dm-verity: restart or panic on an I/O error"

[Mikulas Patocka]

This reverts commit e6a3531dd542cb127c8de32ab1e54a48ae19962b.

The problem that the commit e6a3531dd542cb127c8de32ab1e54a48ae19962b
fixes was reported as a security bug, but Google engineers working on
Android and ChromeOS didn't want to change the default behavior, they
want to get -EIO rather than restarting the system, so I am reverting
that commit.

Signed-off-by: Mikulas Patocka <mpato...@redhat.com>
Cc: sta...@vger.kernel.org
Fixes: e6a3531dd542 ("dm-verity: restart or panic on an I/O error")

---
 drivers/md/dm-verity-target.c |   23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

Index: linux-2.6/drivers/md/dm-verity-target.c
===================================================================
--- linux-2.6.orig/drivers/md/dm-verity-target.c        2024-10-02 
12:40:18.000000000 +0200
+++ linux-2.6/drivers/md/dm-verity-target.c     2024-10-02 12:40:18.000000000 
+0200
@@ -273,10 +273,8 @@ out:
        if (v->mode == DM_VERITY_MODE_LOGGING)
                return 0;
 
-       if (v->mode == DM_VERITY_MODE_RESTART) {
-               pr_emerg("dm-verity device corrupted\n");
-               emergency_restart();
-       }
+       if (v->mode == DM_VERITY_MODE_RESTART)
+               kernel_restart("dm-verity device corrupted");
 
        if (v->mode == DM_VERITY_MODE_PANIC)
                panic("dm-verity device corrupted");
@@ -599,23 +597,6 @@ static void verity_finish_io(struct dm_v
        if (!static_branch_unlikely(&use_bh_wq_enabled) || !io->in_bh)
                verity_fec_finish_io(io);
 
-       if (unlikely(status != BLK_STS_OK) &&
-           unlikely(!(bio->bi_opf & REQ_RAHEAD)) &&
-           !verity_is_system_shutting_down()) {
-               if (v->mode == DM_VERITY_MODE_RESTART ||
-                   v->mode == DM_VERITY_MODE_PANIC)
-                       DMERR_LIMIT("%s has error: %s", v->data_dev->name,
-                                       blk_status_to_str(status));
-
-               if (v->mode == DM_VERITY_MODE_RESTART) {
-                       pr_emerg("dm-verity device corrupted\n");
-                       emergency_restart();
-               }
-
-               if (v->mode == DM_VERITY_MODE_PANIC)
-                       panic("dm-verity device corrupted");
-       }
-
        bio_endio(bio);
 }