From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Nov 2021 00:34:02 +0000 (-0700)
Subject: Merge tag 'Smack-for-5.16' of https://github.com/cschaufler/smack-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6f2b76a4a384e05ac8d3349831f29dff5de1e1e2;p=linux.git

Merge tag 'Smack-for-5.16' of https://github.com/cschaufler/smack-next

Pull smack updates from Casey Schaufler:
 "Multiple corrections to smackfs:

   - a change for overlayfs support that corrects the initial attributes
     on created files

   - code clean-up for netlabel processing

   - several fixes in smackfs for a variety of reasons

   - Errors reported by W=1 have been addressed

  All told, nothing challenging"

* tag 'Smack-for-5.16' of https://github.com/cschaufler/smack-next:
  smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi
  smackfs: use __GFP_NOFAIL for smk_cipso_doi()
  Smack: fix W=1 build warnings
  smack: remove duplicated hook function
  Smack:- Use overlay inode label in smack_inode_copy_up()
  smack: Guard smack_ipv6_lock definition within a SMACK_IPV6_PORT_LABELING block
  smackfs: Fix use-after-free in netlbl_catmap_walk()
---

6f2b76a4a384e05ac8d3349831f29dff5de1e1e2