Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull lockdown update from James Morris: "An update for the security subsystem to allow unprivileged users to see the status of the lockdown feature. From Jeremy Cline" Also an added comment to describe CAP_SETFCAP. * 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: capabilities: add description for CAP_SETFCAP lockdown: Allow unprivileged users to see lockdown status

Linus Torvalds committed 6 years ago

Commit d9afbb32 parents f41030a 56f2e3b2 files · +3 −1Browse files

Unified · Split

2 files

include/uapi/linux/capability.h +2 −0
security/lockdown/lockdown.c +1 −1

include/uapi/linux/capability.h+2−0

@@ -332,6 +332,8 @@ struct vfs_ns_cap_data { · 331 unmodified lines
332		332
333	#define CAP_AUDIT_CONTROL 30	333	#define CAP_AUDIT_CONTROL 30
334		334
		335	/* Set or remove capabilities on files */
		336
335	#define CAP_SETFCAP 31	337	#define CAP_SETFCAP 31
336		338
337	/* Override MAC access.	339	/* Override MAC access.

security/lockdown/lockdown.c+1−1

@@ -150,7 +150,7 @@ static int __init lockdown_secfs_init(void) · 149 unmodified lines
150	{	150	{
151	struct dentry *dentry;	151	struct dentry *dentry;
152		152
153	dentry = securityfs_create_file("lockdown", 0600, NULL, NULL,	153	dentry = securityfs_create_file("lockdown", 0644, NULL, NULL,
154	&lockdown_ops);	154	&lockdown_ops);
155	return PTR_ERR_OR_ZERO(dentry);	155	return PTR_ERR_OR_ZERO(dentry);
156	}	156	}