From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 Sep 2019 21:25:45 +0000 (-0700)
Subject: Merge tag 'smack-for-5.4-rc1' of git://github.com/cschaufler/smack-next
X-Git-Tag: v5.15~5439
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e94f8ccde4710f9a3e51dd3bc6134c96e33f29b3;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'smack-for-5.4-rc1' of git://github.com/cschaufler/smack-next

Pull smack updates from Casey Schaufler:
 "Four patches for v5.4. Nothing is major.

  All but one are in response to mechanically detected potential issues.
  The remaining patch cleans up kernel-doc notations"

* tag 'smack-for-5.4-rc1' of git://github.com/cschaufler/smack-next:
  smack: use GFP_NOFS while holding inode_smack::smk_lock
  security: smack: Fix possible null-pointer dereferences in smack_socket_sock_rcv_skb()
  smack: fix some kernel-doc notations
  Smack: Don't ignore other bprm->unsafe flags if LSM_UNSAFE_PTRACE is set
---

e94f8ccde4710f9a3e51dd3bc6134c96e33f29b3