From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Jan 2022 21:03:06 +0000 (-0800)
Subject: Merge tag 'selinux-pr-20220110' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.1-rc5~2275
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a135ce4400bb87f229ab33a663987327d9e0b2a0;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'selinux-pr-20220110' of git://git./linux/kernel/git/pcmoore/selinux

Pull selinux updates from Paul Moore:
 "Nothing too significant, but five SELinux patches for v5.17 that do
  the following:

   - Harden the code through additional use of the struct_size() macro

   - Plug some memory leaks

   - Clean up the code via removal of the security_add_mnt_opt() LSM
     hook and minor tweaks to selinux_add_opt()

   - Rename security_task_getsecid_subj() to better reflect its actual
     behavior/use - now called security_current_getsecid_subj()"

* tag 'selinux-pr-20220110' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: minor tweaks to selinux_add_opt()
  selinux: fix potential memleak in selinux_add_opt()
  security,selinux: remove security_add_mnt_opt()
  selinux: Use struct_size() helper in kmalloc()
  lsm: security_task_getsecid_subj() -> security_current_getsecid_subj()
---

a135ce4400bb87f229ab33a663987327d9e0b2a0