kevin/linux
1
Fork 0
Code

lsm/stable-6.7 PR 20231109

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJIBAABCAAyFiEES0KozwfymdVUl37v6iDy2pc3iXMFAmVNb+wUHHBhdWxAcGF1
 bC1tb29yZS5jb20ACgkQ6iDy2pc3iXNSRA//domDF307J69o/pk+jO0MqxvK5vm/
 ibb/JBVQ56xt0+mztxjOoS0j7szFBbK02Y4tVz3Y0ohAzSvlqiPZvDV6vTWA0Mh3
 n6krX5RKbEqyofS+1A8gSCkhigSe3Qwb9+9q5TAg/QQ+0//Usix7G2Yd1GP70uDl
 vhkXP7fawA2rBKWvCXM4ZFrbqPIYzUVRARtffe2FmkT2AWbrQNIXvFzn3SxAOONR
 zfPfwM7mBjxOXSr//NnABOEFvWnR0U+IfjhaBGDnlqi4AMaGQMP2dy9I6RnALWYk
 UsVyZNxk6Y2mPejZjicNj89A0NSs7xQHQcmWl1IUnO7l3YPfPKLPP7cTYz0usKmL
 LYOAml8aBaDUXsV8zeogOcT6Nck0YwWfms7jk8VQg1wwMF3luA3HOui6jbQIiN0z
 PhUSEVlLwM7scrLG37zKFRgcTH9DgyZRRBMETpClPHs1cs1+TP7D9hlA/BkFEtPd
 Vppap6rcvFxtfMT6yGoc/hlIIn3d8U5UfEYqHUMYskapWDC8E32Z+ddNIhR264Sw
 3Wo5673AA+qrc08YNqgyZNkAQx48g+xd6d+rjzUFNo4sx/ewW//ExY86n9EY1PUv
 jAN6m7THjro937f9DaXFVasLWgJ00jwV3UElaEB/JUlYMXyRf/S0Et/OP6UHoPdh
 au/DhdR7N56npX8=
 =LI/7
 -----END PGP SIGNATURE-----

Merge tag 'lsm-pr-20231109' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm

Pull lsm updates from Paul Moore:
 "We've got two small patches to correct the default return
  value of two LSM hooks: security_vm_enough_memory_mm() and
  security_inode_getsecctx()"

* tag 'lsm-pr-20231109' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm:
  lsm: fix default return value for inode_getsecctx
  lsm: fix default return value for vm_enough_memory
This commit is contained in:
Linus Torvalds 2023-11-10 10:58:49 -08:00
commit ead3b62a34
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/lsm_hook_defs.h
View File

@ -48,7 +48,7 @@ LSM_HOOK(int, 0, quota_on, struct dentry *dentry)
LSM_HOOK(int, 0, syslog, int type)
LSM_HOOK(int, 0, settime, const struct timespec64 *ts,
const struct timezone *tz)
LSM_HOOK(int, 0, vm_enough_memory, struct mm_struct *mm, long pages)
LSM_HOOK(int, 1, vm_enough_memory, struct mm_struct *mm, long pages)
LSM_HOOK(int, 0, bprm_creds_for_exec, struct linux_binprm *bprm)
LSM_HOOK(int, 0, bprm_creds_from_file, struct linux_binprm *bprm, const struct file *file)
LSM_HOOK(int, 0, bprm_check_security, struct linux_binprm *bprm)
@ -273,7 +273,7 @@ LSM_HOOK(void, LSM_RET_VOID, release_secctx, char *secdata, u32 seclen)
LSM_HOOK(void, LSM_RET_VOID, inode_invalidate_secctx, struct inode *inode)
LSM_HOOK(int, 0, inode_notifysecctx, struct inode *inode, void *ctx, u32 ctxlen)
LSM_HOOK(int, 0, inode_setsecctx, struct dentry *dentry, void *ctx, u32 ctxlen)
LSM_HOOK(int, 0, inode_getsecctx, struct inode *inode, void **ctx,
LSM_HOOK(int, -EOPNOTSUPP, inode_getsecctx, struct inode *inode, void **ctx,
u32 *ctxlen)
#if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)