• Linus Torvalds's avatar
    Merge tag 'integrity-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity · 717e6eb4
    Linus Torvalds authored
    Pull integrity updates from Mimi Zohar:
     "Aside from the one cleanup, the other changes are bug fixes:
    
      Cleanup:
    
       - Include missing iMac Pro 2017 in list of Macs with T2 security chip
    
      Bug fixes:
    
       - Improper instantiation of "encrypted" keys with user provided data
    
       - Not handling delay in updating LSM label based IMA policy rules
         (-ESTALE)
    
       - IMA and integrity memory leaks on error paths
    
       - CONFIG_IMA_DEFAULT_HASH_SM3 hash algorithm renamed"
    
    * tag 'integrity-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
      ima: Fix hash dependency to correct algorithm
      ima: Fix misuse of dereference of pointer in template_desc_init_fields()
      integrity: Fix memory leakage in keyring allocation error path
      ima: Fix memory leak in __ima_inode_hash()
      ima: Handle -ESTALE returned by ima_filter_rule_match()
      ima: Simplify ima_lsm_copy_rule
      ima: Fix a potential NULL pointer access in ima_restore_measurement_list
      efi: Add iMac Pro 2017 to uefi skip cert quirk
      KEYS: encrypted: fix key instantiation with user-provided data
    717e6eb4
ima_main.c 30.7 KB