mirror of
https://github.com/torvalds/linux.git
synced 2026-03-08 04:04:43 +01:00
bdde21d3e7
While reworking the LSM initialization code the
/proc/sys/vm/mmap_min_addr handler was inadvertently caught up in the
change and the procfs entry wasn't setup when CONFIG_SECURITY was not
selected at kernel build time. This patch restores the previous behavior
and ensures that the procfs entry is setup regardless of the
CONFIG_SECURITY state.
Future work will improve upon this, likely by moving the procfs handler
into the mm subsystem, but this patch should resolve the immediate
regression.
Fixes: 4ab5efcc28 ("lsm: consolidate all of the LSM framework initcalls")
Reported-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Tested-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: Kees Cook <kees@kernel.org>
Signed-off-by: Paul Moore <paul@paul-moore.com>
49 lines
1 KiB
C
49 lines
1 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* LSM functions
|
|
*/
|
|
|
|
#ifndef _LSM_H_
|
|
#define _LSM_H_
|
|
|
|
#include <linux/printk.h>
|
|
#include <linux/lsm_hooks.h>
|
|
#include <linux/lsm_count.h>
|
|
|
|
/* LSM debugging */
|
|
extern bool lsm_debug;
|
|
#define lsm_pr(...) pr_info(__VA_ARGS__)
|
|
#define lsm_pr_cont(...) pr_cont(__VA_ARGS__)
|
|
#define lsm_pr_dbg(...) \
|
|
do { \
|
|
if (lsm_debug) \
|
|
pr_info(__VA_ARGS__); \
|
|
} while (0)
|
|
|
|
/* List of configured LSMs */
|
|
extern unsigned int lsm_active_cnt;
|
|
extern const struct lsm_id *lsm_idlist[];
|
|
|
|
/* LSM blob configuration */
|
|
extern struct lsm_blob_sizes blob_sizes;
|
|
|
|
/* LSM blob caches */
|
|
extern struct kmem_cache *lsm_file_cache;
|
|
extern struct kmem_cache *lsm_inode_cache;
|
|
|
|
/* LSM blob allocators */
|
|
int lsm_cred_alloc(struct cred *cred, gfp_t gfp);
|
|
int lsm_task_alloc(struct task_struct *task);
|
|
|
|
/* LSM framework initializers */
|
|
|
|
#ifdef CONFIG_SECURITYFS
|
|
int securityfs_init(void);
|
|
#else
|
|
static inline int securityfs_init(void)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif /* CONFIG_SECURITYFS */
|
|
|
|
#endif /* _LSM_H_ */
|