Commit 38747c9a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.13/dm-fixes-2' of...

Merge tag 'for-5.13/dm-fixes-2' of git://

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://
  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
parents 3224374f 7e768532
......@@ -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,
return (uint32_t) chunk_size;
......@@ -15,7 +15,7 @@
static bool require_signatures;
module_param(require_signatures, bool, false);
module_param(require_signatures, bool, 0444);
"Verify the roothash of dm-verity hash tree");
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment