Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50730033 authored by nkk71's avatar nkk71 Committed by Dees Troy
Browse files

cryptfs: Remove dm-crypt device on failed table load 

 * The dm-crypt device needs to be removed from
   the device-mapper driver list otherwise it will
   remain busy and cannot be used later on by
   other processes (eg vold_decrypt) or for further
   testing/debugging in recovery.

Change-Id: I35e43a79ecc3de234ddb9f87f7d75c6439ea7454
parent 9c3b7e99

crypto/lollipop/cryptfs.c

+14 −0
Original line number Diff line number Diff line
@@ -1099,6 +1099,13 @@ static int create_crypto_blk_dev(struct crypt_mnt_ftr *crypt_ftr, const unsigned 
                                         fd, extra_params);

  if (load_count < 0) {

      printf("Cannot load dm-crypt mapping table.\n");



      // Remove the dm-crypt device, otherwise it cannot be used later on by other

      // processes (eg vold_decrypt) or further testing/debugging in recovery

      ioctl_init(io, DM_CRYPT_BUF_SIZE, name, 0);

      if (ioctl(fd, DM_DEV_REMOVE, io)) {

        printf("Cannot remove dm-crypt device %i\n", errno);

      }

      goto errout;

  } else if (load_count > 1) {

      printf("Took %d tries to load dmcrypt table.\n", load_count);
@@ -1109,6 +1116,13 @@ static int create_crypto_blk_dev(struct crypt_mnt_ftr *crypt_ftr, const unsigned 


  if (ioctl(fd, DM_DEV_SUSPEND, io)) {

    printf("Cannot resume the dm-crypt device\n");



    // Remove the dm-crypt device, otherwise it cannot be used later on by other

    // processes (eg vold_decrypt) or further testing/debugging in recovery

    ioctl_init(io, DM_CRYPT_BUF_SIZE, name, 0);

    if (ioctl(fd, DM_DEV_REMOVE, io)) {

      printf("Cannot remove dm-crypt device %i\n", errno);

    }

    goto errout;

  }