diff options
author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2020-05-23 01:01:13 +0300 |
---|---|---|
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2020-05-23 01:01:13 +0300 |
commit | 1f422417945d08731e2915e0addb976f11b3a85a (patch) | |
tree | 7ef06daa2a34c3b527e3eb7a064bc4af0c9100c0 /scripts/selinux/genheaders/genheaders.c | |
parent | c177e2975430cec296aa52a0d413e447417d6cf9 (diff) | |
parent | 6d15120b282e49811a47f2f6d6b749d178be7e99 (diff) | |
download | linux-1f422417945d08731e2915e0addb976f11b3a85a.tar.xz |
Merge branch 'timers/drivers/timer-ti' into timers/drivers/next
Diffstat (limited to 'scripts/selinux/genheaders/genheaders.c')
-rw-r--r-- | scripts/selinux/genheaders/genheaders.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c index 544ca126a8a8..f355b3e0e968 100644 --- a/scripts/selinux/genheaders/genheaders.c +++ b/scripts/selinux/genheaders/genheaders.c @@ -67,8 +67,12 @@ int main(int argc, char *argv[]) } isids_len = sizeof(initial_sid_to_string) / sizeof (char *); - for (i = 1; i < isids_len; i++) - initial_sid_to_string[i] = stoupperx(initial_sid_to_string[i]); + for (i = 1; i < isids_len; i++) { + const char *s = initial_sid_to_string[i]; + + if (s) + initial_sid_to_string[i] = stoupperx(s); + } fprintf(fout, "/* This file is automatically generated. Do not edit. */\n"); fprintf(fout, "#ifndef _SELINUX_FLASK_H_\n#define _SELINUX_FLASK_H_\n\n"); @@ -82,7 +86,8 @@ int main(int argc, char *argv[]) for (i = 1; i < isids_len; i++) { const char *s = initial_sid_to_string[i]; - fprintf(fout, "#define SECINITSID_%-39s %2d\n", s, i); + if (s) + fprintf(fout, "#define SECINITSID_%-39s %2d\n", s, i); } fprintf(fout, "\n#define SECINITSID_NUM %d\n", i-1); fprintf(fout, "\nstatic inline bool security_is_socket_class(u16 kern_tclass)\n"); |