Skip to content

Commit fea27bc

Browse files
torvaldstorvalds
committed
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
2 parents 83a5084 + dfbd199 commit fea27bc

3 files changed

Lines changed: 1 addition & 2 deletions

File tree

‎scripts/selinux/genheaders/genheaders.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <string.h>
1010
#include <errno.h>
1111
#include <ctype.h>
12-
#include <sys/socket.h>
1312

1413
struct security_class_mapping {
1514
const char *name;

‎scripts/selinux/mdp/mdp.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include <stdlib.h>
3333
#include <unistd.h>
3434
#include <string.h>
35-
#include <sys/socket.h>
3635

3736
static void usage(char *name)
3837
{

‎security/selinux/include/classmap.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
#include <linux/capability.h>
3+
#include <linux/socket.h>
34

45
#define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \
56
"getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map"

0 commit comments

Comments
 (0)