]> nv-tegra.nvidia Code Review - linux-4.9.git/commitdiff
ANDROID: AVB error handler to invalidate vbmeta partition.
authorDavid Zeuthen <zeuthen@google.com>
Tue, 24 Jan 2017 18:17:01 +0000 (13:17 -0500)
committermobile promotions <svcmobile_promotions@nvidia.com>
Sat, 20 Oct 2018 06:34:07 +0000 (23:34 -0700)
If androidboot.vbmeta.invalidate_on_error is 'yes' and
androidboot.vbmeta.device is set and points to a device with vbmeta
magic, this header will be overwritten upon an irrecoverable dm-verity
error. The side-effect of this is that the slot will fail to verify on
next reboot, effectively triggering the boot loader to fallback to
another slot. This work both if the vbmeta struct is at the start of a
partition or if there's an AVB footer at the end.

This code is based on drivers/md/dm-verity-chromeos.c from ChromiumOS.

Signed-off-by: David Zeuthen <zeuthen@google.com>
(cherry picked from commit 9dc978d43ec78fb3d5126c1155369bd70d29fc96)

Bug 200437731

Change-Id: I2a8b155007a82ef70891584d031494895c7fa112
Reviewed-on: https://git-master.nvidia.com/r/1925339
GVS: Gerrit_Virtual_Submit
Reviewed-by: Gerber Huang <gerberh@nvidia.com>
Tested-by: Gerber Huang <gerberh@nvidia.com>
Reviewed-by: Yijun Zhou <yijunz@nvidia.com>
Reviewed-by: Ian Chang <ianc@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
drivers/md/Kconfig
drivers/md/Makefile
drivers/md/dm-verity-avb.c [new file with mode: 0644]
drivers/md/dm-verity-target.c
drivers/md/dm-verity.h

index c786f6bc2188072214801108f9684379077ff4b2..ebdb7910666b15730c1b8f2f6ebf7287e0a0ce9a 100644 (file)
@@ -516,6 +516,17 @@ config DM_LOG_WRITES
 
          If unsure, say N.
 
+config DM_VERITY_AVB
+       tristate "Support AVB specific verity error behavior"
+       depends on DM_VERITY
+       ---help---
+         Enables Android Verified Boot platform-specific error
+         behavior. In particular, it will modify the vbmeta partition
+         specified on the kernel command-line when non-transient error
+         occurs (followed by a panic).
+
+         If unsure, say N.
+
 config DM_ANDROID_VERITY
        bool "Android verity target support"
        depends on BLK_DEV_DM=y
index f26ce41af389a795f9f6b7f5698fb600c336738d..63c317063efac72e592d6c7e2d077d74c29119a3 100644 (file)
@@ -68,3 +68,7 @@ endif
 ifeq ($(CONFIG_DM_VERITY_FEC),y)
 dm-verity-objs                 += dm-verity-fec.o
 endif
+
+ifeq ($(CONFIG_DM_VERITY_AVB),y)
+dm-verity-objs                 += dm-verity-avb.o
+endif
diff --git a/drivers/md/dm-verity-avb.c b/drivers/md/dm-verity-avb.c
new file mode 100644 (file)
index 0000000..89f95e4
--- /dev/null
@@ -0,0 +1,229 @@
+/*
+ * Copyright (C) 2017 Google.
+ *
+ * This file is released under the GPLv2.
+ *
+ * Based on drivers/md/dm-verity-chromeos.c
+ */
+
+#include <linux/device-mapper.h>
+#include <linux/module.h>
+#include <linux/mount.h>
+
+#define DM_MSG_PREFIX "verity-avb"
+
+/* Set via module parameters. */
+static char avb_vbmeta_device[64];
+static char avb_invalidate_on_error[4];
+
+static void invalidate_vbmeta_endio(struct bio *bio)
+{
+       if (bio->bi_error)
+               DMERR("invalidate_vbmeta_endio: error %d", bio->bi_error);
+       complete(bio->bi_private);
+}
+
+static int invalidate_vbmeta_submit(struct bio *bio,
+                                   struct block_device *bdev,
+                                   int op, int access_last_sector,
+                                   struct page *page)
+{
+       DECLARE_COMPLETION_ONSTACK(wait);
+
+       bio->bi_private = &wait;
+       bio->bi_end_io = invalidate_vbmeta_endio;
+       bio->bi_bdev = bdev;
+       bio_set_op_attrs(bio, op, REQ_SYNC | REQ_NOIDLE);
+
+       bio->bi_iter.bi_sector = 0;
+       if (access_last_sector) {
+               sector_t last_sector;
+
+               last_sector = (i_size_read(bdev->bd_inode)>>SECTOR_SHIFT) - 1;
+               bio->bi_iter.bi_sector = last_sector;
+       }
+       if (!bio_add_page(bio, page, PAGE_SIZE, 0)) {
+               DMERR("invalidate_vbmeta_submit: bio_add_page error");
+               return -EIO;
+       }
+
+       submit_bio(bio);
+       /* Wait up to 2 seconds for completion or fail. */
+       if (!wait_for_completion_timeout(&wait, msecs_to_jiffies(2000)))
+               return -EIO;
+       return 0;
+}
+
+static int invalidate_vbmeta(dev_t vbmeta_devt)
+{
+       int ret = 0;
+       struct block_device *bdev;
+       struct bio *bio;
+       struct page *page;
+       fmode_t dev_mode;
+       /* Ensure we do synchronous unblocked I/O. We may also need
+        * sync_bdev() on completion, but it really shouldn't.
+        */
+       int access_last_sector = 0;
+
+       DMINFO("invalidate_vbmeta: acting on device %d:%d",
+              MAJOR(vbmeta_devt), MINOR(vbmeta_devt));
+
+       /* First we open the device for reading. */
+       dev_mode = FMODE_READ | FMODE_EXCL;
+       bdev = blkdev_get_by_dev(vbmeta_devt, dev_mode,
+                                invalidate_vbmeta);
+       if (IS_ERR(bdev)) {
+               DMERR("invalidate_kernel: could not open device for reading");
+               dev_mode = 0;
+               ret = -ENOENT;
+               goto failed_to_read;
+       }
+
+       bio = bio_alloc(GFP_NOIO, 1);
+       if (!bio) {
+               ret = -ENOMEM;
+               goto failed_bio_alloc;
+       }
+
+       page = alloc_page(GFP_NOIO);
+       if (!page) {
+               ret = -ENOMEM;
+               goto failed_to_alloc_page;
+       }
+
+       access_last_sector = 0;
+       ret = invalidate_vbmeta_submit(bio, bdev, REQ_OP_READ,
+                                      access_last_sector, page);
+       if (ret) {
+               DMERR("invalidate_vbmeta: error reading");
+               goto failed_to_submit_read;
+       }
+
+       /* We have a page. Let's make sure it looks right. */
+       if (memcmp("AVB0", page_address(page), 4) == 0) {
+               /* Stamp it. */
+               memcpy(page_address(page), "AVE0", 4);
+               DMINFO("invalidate_vbmeta: found vbmeta partition");
+       } else {
+               /* Could be this is on a AVB footer, check. Also, since the
+                * AVB footer is in the last 64 bytes, adjust for the fact that
+                * we're dealing with 512-byte sectors.
+                */
+               size_t offset = (1<<SECTOR_SHIFT) - 64;
+
+               access_last_sector = 1;
+               ret = invalidate_vbmeta_submit(bio, bdev, REQ_OP_READ,
+                                              access_last_sector, page);
+               if (ret) {
+                       DMERR("invalidate_vbmeta: error reading");
+                       goto failed_to_submit_read;
+               }
+               if (memcmp("AVBf", page_address(page) + offset, 4) != 0) {
+                       DMERR("invalidate_vbmeta on non-vbmeta partition");
+                       ret = -EINVAL;
+                       goto invalid_header;
+               }
+               /* Stamp it. */
+               memcpy(page_address(page) + offset, "AVE0", 4);
+               DMINFO("invalidate_vbmeta: found vbmeta footer partition");
+       }
+
+       /* Now rewrite the changed page - the block dev was being
+        * changed on read. Let's reopen here.
+        */
+       blkdev_put(bdev, dev_mode);
+       dev_mode = FMODE_WRITE | FMODE_EXCL;
+       bdev = blkdev_get_by_dev(vbmeta_devt, dev_mode,
+                                invalidate_vbmeta);
+       if (IS_ERR(bdev)) {
+               DMERR("invalidate_vbmeta: could not open device for writing");
+               dev_mode = 0;
+               ret = -ENOENT;
+               goto failed_to_write;
+       }
+
+       /* We re-use the same bio to do the write after the read. Need to reset
+        * it to initialize bio->bi_remaining.
+        */
+       bio_reset(bio);
+
+       ret = invalidate_vbmeta_submit(bio, bdev, REQ_OP_WRITE,
+                                      access_last_sector, page);
+       if (ret) {
+               DMERR("invalidate_vbmeta: error writing");
+               goto failed_to_submit_write;
+       }
+
+       DMERR("invalidate_vbmeta: completed.");
+       ret = 0;
+failed_to_submit_write:
+failed_to_write:
+invalid_header:
+       __free_page(page);
+failed_to_submit_read:
+       /* Technically, we'll leak a page with the pending bio, but
+        * we're about to reboot anyway.
+        */
+failed_to_alloc_page:
+       bio_put(bio);
+failed_bio_alloc:
+       if (dev_mode)
+               blkdev_put(bdev, dev_mode);
+failed_to_read:
+       return ret;
+}
+
+void dm_verity_avb_error_handler(void)
+{
+       dev_t dev;
+
+       DMINFO("AVB error handler called for %s", avb_vbmeta_device);
+
+       if (strcmp(avb_invalidate_on_error, "yes") != 0) {
+               DMINFO("Not configured to invalidate");
+               return;
+       }
+
+       if (avb_vbmeta_device[0] == '\0') {
+               DMERR("avb_vbmeta_device parameter not set");
+               goto fail_no_dev;
+       }
+
+       dev = name_to_dev_t(avb_vbmeta_device);
+       if (!dev) {
+               DMERR("No matching partition for device: %s",
+                     avb_vbmeta_device);
+               goto fail_no_dev;
+       }
+
+       invalidate_vbmeta(dev);
+
+fail_no_dev:
+       ;
+}
+
+static int __init dm_verity_avb_init(void)
+{
+       DMINFO("AVB error handler initialized with vbmeta device: %s",
+              avb_vbmeta_device);
+       return 0;
+}
+
+static void __exit dm_verity_avb_exit(void)
+{
+}
+
+module_init(dm_verity_avb_init);
+module_exit(dm_verity_avb_exit);
+
+MODULE_AUTHOR("David Zeuthen <zeuthen@google.com>");
+MODULE_DESCRIPTION("AVB-specific error handler for dm-verity");
+MODULE_LICENSE("GPL");
+
+/* Declare parameter with no module prefix */
+#undef MODULE_PARAM_PREFIX
+#define MODULE_PARAM_PREFIX    "androidboot.vbmeta."
+module_param_string(device, avb_vbmeta_device, sizeof(avb_vbmeta_device), 0);
+module_param_string(invalidate_on_error, avb_invalidate_on_error,
+                   sizeof(avb_invalidate_on_error), 0);
index 91173bf84baf9de87e2481633493f8e37fe54e1d..fa7da6b69c70c96e0118658869dadd615aa89734 100644 (file)
@@ -233,8 +233,12 @@ out:
        if (v->mode == DM_VERITY_MODE_LOGGING)
                return 0;
 
-       if (v->mode == DM_VERITY_MODE_RESTART)
+       if (v->mode == DM_VERITY_MODE_RESTART) {
+#ifdef CONFIG_DM_VERITY_AVB
+               dm_verity_avb_error_handler();
+#endif
                kernel_restart("dm-verity device corrupted");
+       }
 
        return 1;
 }
index 75effca400a3b170ae436334f0c961e335bd9096..a90d1d416107f4bf0caa0983581169537e551731 100644 (file)
@@ -136,4 +136,5 @@ extern void verity_io_hints(struct dm_target *ti, struct queue_limits *limits);
 extern void verity_dtr(struct dm_target *ti);
 extern int verity_ctr(struct dm_target *ti, unsigned argc, char **argv);
 extern int verity_map(struct dm_target *ti, struct bio *bio);
+extern void dm_verity_avb_error_handler(void);
 #endif /* DM_VERITY_H */