- Fix DM verity target's optional argument processing.

- Fix DM core's zoned model and zone sectors checks.
 
 - Fix spurious "detected capacity change" pr_info() when creating new
   DM device.
 
 - Fix DM ioctl out of bounds array access in handling of
   DM_LIST_DEVICES_CMD when no devices exist.
 -----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEJfWUX4UqZ4x1O2wixSPxCi2dA1oFAmBeMf0THHNuaXR6ZXJA
 cmVkaGF0LmNvbQAKCRDFI/EKLZ0DWlr1B/9Jh6YUtTe1dN5rCEPheikFwcsDgoYk
 zfgeS57GHv/rzQ9hdVPBqHvc4ZjEZ7hLkV8Pa0eyyDnslwHfH/B8/38LVSdOe1QK
 52787CXTAcBHjnEzGbs2TP2oGhHQ4rN9h6lMKzs3jcglWunutHKnesAXGC3yItsr
 WzYzskiL/gpS+Px936JVVjJirzKFX1jnbXZ4BMq3/7vqu5DJ8M+2mrf4H1wxfIMP
 NeV40j4vAkqJKbQyVFYfzRdXxP+FswR9kLHQv96RW0y98JDg7h5TtYGrAaRZdpRw
 HQ+96/dZWyH2MpJ5nptSIVbU71u9EtLuRCa5HhB903p14NQsrR0qGBfc
 =YT+2
 -----END PGP SIGNATURE-----

Merge tag 'for-5.12/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull device mapper fixes from Mike Snitzer:

 - Fix DM verity target's optional argument processing.

 - Fix DM core's zoned model and zone sectors checks.

 - Fix spurious "detected capacity change" pr_info() when creating new
   DM device.

 - Fix DM ioctl out of bounds array access in handling of
   DM_LIST_DEVICES_CMD when no devices exist.

* tag 'for-5.12/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm ioctl: fix out of bounds array access when no devices
  dm: don't report "detected capacity change" on device creation
  dm table: Fix zoned model check and zone sectors check
  dm verity: fix DM_VERITY_OPTS_MAX value
This commit is contained in:
Linus Torvalds 2021-03-26 12:21:05 -07:00
commit 0f4498cef9
6 changed files with 46 additions and 13 deletions

View file

@ -253,7 +253,11 @@ struct target_type {
#define dm_target_passes_integrity(type) ((type)->features & DM_TARGET_PASSES_INTEGRITY)
/*
* Indicates that a target supports host-managed zoned block devices.
* Indicates support for zoned block devices:
* - DM_TARGET_ZONED_HM: the target also supports host-managed zoned
* block devices but does not support combining different zoned models.
* - DM_TARGET_MIXED_ZONED_MODEL: the target supports combining multiple
* devices with different zoned models.
*/
#ifdef CONFIG_BLK_DEV_ZONED
#define DM_TARGET_ZONED_HM 0x00000040
@ -275,6 +279,15 @@ struct target_type {
#define DM_TARGET_PASSES_CRYPTO 0x00000100
#define dm_target_passes_crypto(type) ((type)->features & DM_TARGET_PASSES_CRYPTO)
#ifdef CONFIG_BLK_DEV_ZONED
#define DM_TARGET_MIXED_ZONED_MODEL 0x00000200
#define dm_target_supports_mixed_zoned_model(type) \
((type)->features & DM_TARGET_MIXED_ZONED_MODEL)
#else
#define DM_TARGET_MIXED_ZONED_MODEL 0x00000000
#define dm_target_supports_mixed_zoned_model(type) (false)
#endif
struct dm_target {
struct dm_table *table;
struct target_type *type;