Skip to content

Commit

Permalink
Merge tag 'for-5.13/dm-fixes-2' of git://git.kernel.org/pub/scm/linux…
Browse files Browse the repository at this point in the history
…/kernel/git/device-mapper/linux-dm

Pull device mapper fixes from Mike Snitzer:

 - Fix DM verity target's 'require_signatures' module_param permissions.

 - Revert DM snapshot fix from v5.13-rc3 and then properly fix crash
   when an origin has no snapshots. This allows only the proper fix to
   go to stable@ (since the original fix was successfully dropped).

* tag 'for-5.13/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm snapshot: properly fix a crash when an origin has no snapshots
  dm snapshot: revert "fix a crash when an origin has no snapshots"
  dm verity: fix require_signatures module_param permissions
  • Loading branch information
Linus Torvalds committed May 27, 2021
2 parents 3224374 + 7e76853 commit 38747c9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion drivers/md/dm-snap.c
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,8 @@ static uint32_t __minimum_chunk_size(struct origin *o)

if (o)
list_for_each_entry(snap, &o->snapshots, list)
chunk_size = min(chunk_size, snap->store->chunk_size);
chunk_size = min_not_zero(chunk_size,
snap->store->chunk_size);

return (uint32_t) chunk_size;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/dm-verity-verify-sig.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#define DM_VERITY_VERIFY_ERR(s) DM_VERITY_ROOT_HASH_VERIFICATION " " s

static bool require_signatures;
module_param(require_signatures, bool, false);
module_param(require_signatures, bool, 0444);
MODULE_PARM_DESC(require_signatures,
"Verify the roothash of dm-verity hash tree");

Expand Down

0 comments on commit 38747c9

Please sign in to comment.