Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

SELinux: turn mount options strings into defines

Convert the strings used for mount options into #defines rather than
retyping the string throughout the SELinux code.

Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@namei.org>

authored by

Eric Paris and committed by
James Morris
832cbd9a 0e55a004

+13 -8
+8 -8
security/selinux/hooks.c
··· 321 321 }; 322 322 323 323 static match_table_t tokens = { 324 - {Opt_context, "context=%s"}, 325 - {Opt_fscontext, "fscontext=%s"}, 326 - {Opt_defcontext, "defcontext=%s"}, 327 - {Opt_rootcontext, "rootcontext=%s"}, 324 + {Opt_context, CONTEXT_STR "%s"}, 325 + {Opt_fscontext, FSCONTEXT_STR "%s"}, 326 + {Opt_defcontext, DEFCONTEXT_STR "%s"}, 327 + {Opt_rootcontext, ROOTCONTEXT_STR "%s"}, 328 328 {Opt_error, NULL}, 329 329 }; 330 330 ··· 2287 2287 2288 2288 static inline int selinux_option(char *option, int len) 2289 2289 { 2290 - return (match_prefix("context=", sizeof("context=")-1, option, len) || 2291 - match_prefix("fscontext=", sizeof("fscontext=")-1, option, len) || 2292 - match_prefix("defcontext=", sizeof("defcontext=")-1, option, len) || 2293 - match_prefix("rootcontext=", sizeof("rootcontext=")-1, option, len)); 2290 + return (match_prefix(CONTEXT_STR, sizeof(CONTEXT_STR)-1, option, len) || 2291 + match_prefix(FSCONTEXT_STR, sizeof(FSCONTEXT_STR)-1, option, len) || 2292 + match_prefix(DEFCONTEXT_STR, sizeof(DEFCONTEXT_STR)-1, option, len) || 2293 + match_prefix(ROOTCONTEXT_STR, sizeof(ROOTCONTEXT_STR)-1, option, len)); 2294 2294 } 2295 2295 2296 2296 static inline void take_option(char **to, char *from, int *first, int len)
+5
security/selinux/include/security.h
··· 41 41 #define ROOTCONTEXT_MNT 0x04 42 42 #define DEFCONTEXT_MNT 0x08 43 43 44 + #define CONTEXT_STR "context=" 45 + #define FSCONTEXT_STR "fscontext=" 46 + #define ROOTCONTEXT_STR "rootcontext=" 47 + #define DEFCONTEXT_STR "defcontext=" 48 + 44 49 struct netlbl_lsm_secattr; 45 50 46 51 extern int selinux_enabled;