selinux: move genheaders to security/selinux/

This tool is only used in security/selinux/Makefile.

Move it to security/selinux/ so that 'make clean' can clean it up.

Please note 'make clean' does not clean scripts/ because tools under
scripts/ are often used for external module builds. Obviously, genheaders
is not the case here.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Paul Moore <paul@paul-moore.com>

diff --git a/scripts/remove-stale-files b/scripts/remove-stale-files
index 8fc55a749ccc30b3f9e442df763ced798c3391f2..6e39fa8540df2f6da9d8a1d1e90e105243b495a2 100755 (executable)
--- a/scripts/remove-stale-files
+++ b/scripts/remove-stale-files
@@ -20,6 +20,9 @@ set -e
 # yard. Stale files stay in this file for a while (for some release cycles?),
 # then will be really dead and removed from the code base entirely.
 
+# moved to security/selinux/genheaders
+rm -f scripts/selinux/genheaders/genheaders
+
 rm -f *.spec
 
 rm -f lib/test_fortify.log

diff --git a/scripts/selinux/Makefile b/scripts/selinux/Makefile
index 59494e14989b57f2b50b4625ebe04e05d23e39ec..4b1308fa5732351691b1f853d59d8c648eef0c6f 100644 (file)
--- a/scripts/selinux/Makefile
+++ b/scripts/selinux/Makefile
@@ -1,2 +1,2 @@
 # SPDX-License-Identifier: GPL-2.0-only
-subdir-y := mdp genheaders
+subdir-y := mdp

diff --git a/scripts/selinux/genheaders/.gitignore b/scripts/selinux/genheaders/.gitignore
deleted file mode 100644 (file)
index 5fcadd3..0000000
--- a/scripts/selinux/genheaders/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-genheaders

diff --git a/scripts/selinux/genheaders/Makefile b/scripts/selinux/genheaders/Makefile
deleted file mode 100644 (file)
index 866f60e..0000000
--- a/scripts/selinux/genheaders/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-hostprogs-always-y += genheaders
-HOST_EXTRACFLAGS += -I$(srctree)/security/selinux/include

diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c
deleted file mode 100644 (file)
index 3834d7e..0000000
--- a/scripts/selinux/genheaders/genheaders.c
+++ /dev/null
@@ -1,154 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-
-struct security_class_mapping {
-       const char *name;
-       const char *perms[sizeof(unsigned) * 8 + 1];
-};
-
-#include "classmap.h"
-#include "initial_sid_to_string.h"
-
-const char *progname;
-
-static void usage(void)
-{
-       printf("usage: %s flask.h av_permissions.h\n", progname);
-       exit(1);
-}
-
-static char *stoupperx(const char *s)
-{
-       char *s2 = strdup(s);
-       char *p;
-
-       if (!s2) {
-               fprintf(stderr, "%s:  out of memory\n", progname);
-               exit(3);
-       }
-
-       for (p = s2; *p; p++)
-               *p = toupper(*p);
-       return s2;
-}
-
-int main(int argc, char *argv[])
-{
-       int i, j;
-       int isids_len;
-       FILE *fout;
-
-       progname = argv[0];
-
-       if (argc < 3)
-               usage();
-
-       fout = fopen(argv[1], "w");
-       if (!fout) {
-               fprintf(stderr, "Could not open %s for writing:  %s\n",
-                       argv[1], strerror(errno));
-               exit(2);
-       }
-
-       fprintf(fout, "/* This file is automatically generated.  Do not edit. */\n");
-       fprintf(fout, "#ifndef _SELINUX_FLASK_H_\n#define _SELINUX_FLASK_H_\n\n");
-
-       for (i = 0; secclass_map[i].name; i++) {
-               char *name = stoupperx(secclass_map[i].name);
-
-               fprintf(fout, "#define SECCLASS_%-39s %2d\n", name, i+1);
-               free(name);
-       }
-
-       fprintf(fout, "\n");
-
-       isids_len = sizeof(initial_sid_to_string) / sizeof(char *);
-       for (i = 1; i < isids_len; i++) {
-               const char *s = initial_sid_to_string[i];
-               if (s) {
-                       char *sidname = stoupperx(s);
-
-                       fprintf(fout, "#define SECINITSID_%-39s %2d\n", sidname, i);
-                       free(sidname);
-               }
-       }
-       fprintf(fout, "\n#define SECINITSID_NUM %d\n", i-1);
-       fprintf(fout, "\nstatic inline bool security_is_socket_class(u16 kern_tclass)\n");
-       fprintf(fout, "{\n");
-       fprintf(fout, "\tbool sock = false;\n\n");
-       fprintf(fout, "\tswitch (kern_tclass) {\n");
-       for (i = 0; secclass_map[i].name; i++) {
-               static char s[] = "SOCKET";
-               int len, l;
-               char *name = stoupperx(secclass_map[i].name);
-
-               len = strlen(name);
-               l = sizeof(s) - 1;
-               if (len >= l && memcmp(name + len - l, s, l) == 0)
-                       fprintf(fout, "\tcase SECCLASS_%s:\n", name);
-               free(name);
-       }
-       fprintf(fout, "\t\tsock = true;\n");
-       fprintf(fout, "\t\tbreak;\n");
-       fprintf(fout, "\tdefault:\n");
-       fprintf(fout, "\t\tbreak;\n");
-       fprintf(fout, "\t}\n\n");
-       fprintf(fout, "\treturn sock;\n");
-       fprintf(fout, "}\n");
-
-       fprintf(fout, "\n#endif\n");
-
-       if (fclose(fout) != 0) {
-               fprintf(stderr, "Could not successfully close %s:  %s\n",
-                       argv[1], strerror(errno));
-               exit(4);
-       }
-
-       fout = fopen(argv[2], "w");
-       if (!fout) {
-               fprintf(stderr, "Could not open %s for writing:  %s\n",
-                       argv[2], strerror(errno));
-               exit(5);
-       }
-
-       fprintf(fout, "/* This file is automatically generated.  Do not edit. */\n");
-       fprintf(fout, "#ifndef _SELINUX_AV_PERMISSIONS_H_\n#define _SELINUX_AV_PERMISSIONS_H_\n\n");
-
-       for (i = 0; secclass_map[i].name; i++) {
-               const struct security_class_mapping *map = &secclass_map[i];
-               int len;
-               char *name = stoupperx(map->name);
-
-               len = strlen(name);
-               for (j = 0; map->perms[j]; j++) {
-                       char *permname;
-
-                       if (j >= 32) {
-                               fprintf(stderr, "Too many permissions to fit into an access vector at (%s, %s).\n",
-                                       map->name, map->perms[j]);
-                               exit(5);
-                       }
-                       permname = stoupperx(map->perms[j]);
-                       fprintf(fout, "#define %s__%-*s 0x%08xU\n", name,
-                               39-len, permname, 1U<<j);
-                       free(permname);
-               }
-               free(name);
-       }
-
-       fprintf(fout, "\n#endif\n");
-
-       if (fclose(fout) != 0) {
-               fprintf(stderr, "Could not successfully close %s:  %s\n",
-                       argv[2], strerror(errno));
-               exit(6);
-       }
-
-       exit(0);
-}

diff --git a/security/selinux/.gitignore b/security/selinux/.gitignore
index 168fae13ca5a9bdca305084a6a62d1163ed429e8..01c0df8ab009cf2c17c4eac56c0e3ae4594fe0e8 100644 (file)
--- a/security/selinux/.gitignore
+++ b/security/selinux/.gitignore
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
 av_permissions.h
 flask.h
+/genheaders

diff --git a/security/selinux/Makefile b/security/selinux/Makefile
index c47519ed81565eb409330ffa39d22724f2ed3ac0..86f0575f670da66a9dc57e13a236d6a5551af38e 100644 (file)
--- a/security/selinux/Makefile
+++ b/security/selinux/Makefile
@@ -36,7 +36,10 @@ quiet_cmd_genhdrs = GEN     $(addprefix $(obj)/,$(genhdrs))
 # see the note above, replace the $targets and 'flask.h' rule with the lines
 # below:
 #  targets += $(genhdrs)
-#  $(addprefix $(obj)/,$(genhdrs)) &: scripts/selinux/...
+#  $(addprefix $(obj)/,$(genhdrs)) &: $(obj)/genheaders FORCE
 targets += flask.h
-$(obj)/flask.h: scripts/selinux/genheaders/genheaders FORCE
+$(obj)/flask.h: $(obj)/genheaders FORCE
        $(call if_changed,genhdrs)
+
+hostprogs := genheaders
+HOST_EXTRACFLAGS += -I$(srctree)/security/selinux/include

diff --git a/security/selinux/genheaders.c b/security/selinux/genheaders.c
new file mode 100644 (file)
index 0000000..3834d7e
--- /dev/null
+++ b/security/selinux/genheaders.c
@@ -0,0 +1,154 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <ctype.h>
+
+struct security_class_mapping {
+       const char *name;
+       const char *perms[sizeof(unsigned) * 8 + 1];
+};
+
+#include "classmap.h"
+#include "initial_sid_to_string.h"
+
+const char *progname;
+
+static void usage(void)
+{
+       printf("usage: %s flask.h av_permissions.h\n", progname);
+       exit(1);
+}
+
+static char *stoupperx(const char *s)
+{
+       char *s2 = strdup(s);
+       char *p;
+
+       if (!s2) {
+               fprintf(stderr, "%s:  out of memory\n", progname);
+               exit(3);
+       }
+
+       for (p = s2; *p; p++)
+               *p = toupper(*p);
+       return s2;
+}
+
+int main(int argc, char *argv[])
+{
+       int i, j;
+       int isids_len;
+       FILE *fout;
+
+       progname = argv[0];
+
+       if (argc < 3)
+               usage();
+
+       fout = fopen(argv[1], "w");
+       if (!fout) {
+               fprintf(stderr, "Could not open %s for writing:  %s\n",
+                       argv[1], strerror(errno));
+               exit(2);
+       }
+
+       fprintf(fout, "/* This file is automatically generated.  Do not edit. */\n");
+       fprintf(fout, "#ifndef _SELINUX_FLASK_H_\n#define _SELINUX_FLASK_H_\n\n");
+
+       for (i = 0; secclass_map[i].name; i++) {
+               char *name = stoupperx(secclass_map[i].name);
+
+               fprintf(fout, "#define SECCLASS_%-39s %2d\n", name, i+1);
+               free(name);
+       }
+
+       fprintf(fout, "\n");
+
+       isids_len = sizeof(initial_sid_to_string) / sizeof(char *);
+       for (i = 1; i < isids_len; i++) {
+               const char *s = initial_sid_to_string[i];
+               if (s) {
+                       char *sidname = stoupperx(s);
+
+                       fprintf(fout, "#define SECINITSID_%-39s %2d\n", sidname, i);
+                       free(sidname);
+               }
+       }
+       fprintf(fout, "\n#define SECINITSID_NUM %d\n", i-1);
+       fprintf(fout, "\nstatic inline bool security_is_socket_class(u16 kern_tclass)\n");
+       fprintf(fout, "{\n");
+       fprintf(fout, "\tbool sock = false;\n\n");
+       fprintf(fout, "\tswitch (kern_tclass) {\n");
+       for (i = 0; secclass_map[i].name; i++) {
+               static char s[] = "SOCKET";
+               int len, l;
+               char *name = stoupperx(secclass_map[i].name);
+
+               len = strlen(name);
+               l = sizeof(s) - 1;
+               if (len >= l && memcmp(name + len - l, s, l) == 0)
+                       fprintf(fout, "\tcase SECCLASS_%s:\n", name);
+               free(name);
+       }
+       fprintf(fout, "\t\tsock = true;\n");
+       fprintf(fout, "\t\tbreak;\n");
+       fprintf(fout, "\tdefault:\n");
+       fprintf(fout, "\t\tbreak;\n");
+       fprintf(fout, "\t}\n\n");
+       fprintf(fout, "\treturn sock;\n");
+       fprintf(fout, "}\n");
+
+       fprintf(fout, "\n#endif\n");
+
+       if (fclose(fout) != 0) {
+               fprintf(stderr, "Could not successfully close %s:  %s\n",
+                       argv[1], strerror(errno));
+               exit(4);
+       }
+
+       fout = fopen(argv[2], "w");
+       if (!fout) {
+               fprintf(stderr, "Could not open %s for writing:  %s\n",
+                       argv[2], strerror(errno));
+               exit(5);
+       }
+
+       fprintf(fout, "/* This file is automatically generated.  Do not edit. */\n");
+       fprintf(fout, "#ifndef _SELINUX_AV_PERMISSIONS_H_\n#define _SELINUX_AV_PERMISSIONS_H_\n\n");
+
+       for (i = 0; secclass_map[i].name; i++) {
+               const struct security_class_mapping *map = &secclass_map[i];
+               int len;
+               char *name = stoupperx(map->name);
+
+               len = strlen(name);
+               for (j = 0; map->perms[j]; j++) {
+                       char *permname;
+
+                       if (j >= 32) {
+                               fprintf(stderr, "Too many permissions to fit into an access vector at (%s, %s).\n",
+                                       map->name, map->perms[j]);
+                               exit(5);
+                       }
+                       permname = stoupperx(map->perms[j]);
+                       fprintf(fout, "#define %s__%-*s 0x%08xU\n", name,
+                               39-len, permname, 1U<<j);
+                       free(permname);
+               }
+               free(name);
+       }
+
+       fprintf(fout, "\n#endif\n");
+
+       if (fclose(fout) != 0) {
+               fprintf(stderr, "Could not successfully close %s:  %s\n",
+                       argv[2], strerror(errno));
+               exit(6);
+       }
+
+       exit(0);
+}