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

Pull selinux fix from Paul Moore: "One small patch for the stable folks to fix a problem when building against the latest glibc. I'll be honest and say that I'm not really thrilled with the idea of sending this up right now, but Greg is a little annoyed so here I figured I would at least send this" * tag 'selinux-pr-20190429' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux: selinux: use kernel linux/socket.h for genheaders and mdp

Linus Torvalds committed 7 years ago

Commit fea27bc2 parents 83a5084 dfbd1993 files · +1 −2Browse files

Unified · Split

3 files

scripts/selinux/genheaders/genheaders.c +0 −1
scripts/selinux/mdp/mdp.c +0 −1
security/selinux/include/classmap.h +1 −0

scripts/selinux/genheaders/genheaders.c+0−1

@@ -9,7 +9,6 @@ · 8 unmodified lines
9	9	#include <string.h>
10	10	#include <errno.h>
11	11	#include <ctype.h>
12		−#include <sys/socket.h>
13	12
14	13	struct security_class_mapping {
15	14	const char *name;

scripts/selinux/mdp/mdp.c+0−1

@@ -32,7 +32,6 @@ · 31 unmodified lines
32	32	#include <stdlib.h>
33	33	#include <unistd.h>
34	34	#include <string.h>
35		−#include <sys/socket.h>
36	35
37	36	static void usage(char *name)
38	37	{

security/selinux/include/classmap.h+1−0

@@ -1,5 +1,6 @@
1	1	/* SPDX-License-Identifier: GPL-2.0 */
2	2	#include <linux/capability.h>
	3	+#include <linux/socket.h>
3	4
4	5	#define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \
5	6	"getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map"

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code