libselinux/utils: check for valid contexts to improve error causes
PATCH 1/1 libselinux/utils: check for valid contexts to improve error causes
Return more detailed error messages when the supplied contexts are invalid.
--- libselinux/utils/compute_av.c | 10 ++++++++++ libselinux/utils/compute_create.c | 12 +++++++++++- libselinux/utils/compute_member.c | 12 +++++++++++- libselinux/utils/compute_relabel.c | 10 ++++++++++ libselinux/utils/getdefaultcon.c | 5 +++++ libselinux/utils/selinuxexeccon.c | 6 +++++- libselinux/utils/validatetrans.c | 10 ++++++++++ 7 files changed, 62 insertions(+), 3 deletions(-)
libselinux/utils/compute_av.c +10 -0
@@ -17,6 +17,16 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) {fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);
libselinux/utils/compute_create.c +11 -1
@@ -17,9 +17,19 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) { -fprintf (stderr,"Invalid class '%s'\n" , argv[3 ]); +fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);exit (2 ); }
libselinux/utils/compute_member.c +11 -1
@@ -17,9 +17,19 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) { -fprintf (stderr,"Invalid class '%s'\n" , argv[3 ]); +fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);exit (2 ); }
libselinux/utils/compute_relabel.c +10 -0
@@ -17,6 +17,16 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) {fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);
libselinux/utils/getdefaultcon.c +5 -0
@@ -68,6 +68,11 @@ int main(int argc, char **argv) }else cur_context = argv[optind +1 ]; +if (security_check_context (cur_context)) { +fprintf (stderr,"%s: invalid from context '%s'\n" , argv[0 ], cur_context); +return 3 ; + } +if ((ret =getseuser (user, service, &seuser, &dlevel)) ==0 ) {if (! level) level=dlevel;if (role !=NULL && role[0 ])
libselinux/utils/selinuxexeccon.c +5 -1
@@ -16,7 +16,7 @@ static __attribute__ ((__noreturn__)) void usage(const char *name, const char *dexit (rc); } -static char *get_selinux_proc_context (const char *command,char * execcon) { +static char *get_selinux_proc_context (const char *command,const char * execcon) {char * fcon =NULL , *newcon =NULL ;int ret =getfilecon (command, &fcon);
@@ -43,6 +43,10 @@ int main(int argc, char **argv) } }else { con =strdup (argv[2 ]); +if (security_check_context (con)) { +fprintf (stderr,"%s: invalid from context '%s'\n" , argv[0 ], con); +return -1 ; + } } proccon =get_selinux_proc_context (argv[1 ], con);
libselinux/utils/validatetrans.c +10 -0
@@ -17,6 +17,16 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) {fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);
Signature · 1 line
2.35.1
Quoted 158 lines · Christian Göttsche
Return more detailed error messages when the supplied contexts are invalid.
Signed-off-by Christian Göttsche <[email protected]>--- libselinux/utils/compute_av.c | 10 ++++++++++ libselinux/utils/compute_create.c | 12 +++++++++++- libselinux/utils/compute_member.c | 12 +++++++++++- libselinux/utils/compute_relabel.c | 10 ++++++++++ libselinux/utils/getdefaultcon.c | 5 +++++ libselinux/utils/selinuxexeccon.c | 6 +++++- libselinux/utils/validatetrans.c | 10 ++++++++++ 7 files changed, 62 insertions(+), 3 deletions(-)libselinux/utils/compute_av.c +10
-0@@ -17,6 +17,16 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) {fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);libselinux/utils/compute_create.c +11
-1@@ -17,9 +17,19 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) { -fprintf (stderr,"Invalid class '%s'\n" , argv[3 ]); +fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);exit (2 ); }libselinux/utils/compute_member.c +11
-1@@ -17,9 +17,19 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) { -fprintf (stderr,"Invalid class '%s'\n" , argv[3 ]); +fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);exit (2 ); }libselinux/utils/compute_relabel.c +10
-0@@ -17,6 +17,16 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) {fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);libselinux/utils/getdefaultcon.c +5
-0@@ -68,6 +68,11 @@ int main(int argc, char **argv) }else cur_context = argv[optind +1 ]; +if (security_check_context (cur_context)) { +fprintf (stderr,"%s: invalid from context '%s'\n" , argv[0 ], cur_context); +return 3 ; + } +if ((ret =getseuser (user, service, &seuser, &dlevel)) ==0 ) {if (! level) level=dlevel;if (role !=NULL && role[0 ])libselinux/utils/selinuxexeccon.c +5
-1@@ -16,7 +16,7 @@ static __attribute__ ((__noreturn__)) void usage(const char *name, const char *dexit (rc); } -static char *get_selinux_proc_context (const char *command,char * execcon) { +static char *get_selinux_proc_context (const char *command,const char * execcon) {char * fcon =NULL , *newcon =NULL ;int ret =getfilecon (command, &fcon);@@ -43,6 +43,10 @@ int main(int argc, char **argv) } }else { con =strdup (argv[2 ]); +if (security_check_context (con)) { +fprintf (stderr,"%s: invalid from context '%s'\n" , argv[0 ], con); +return -1 ; + } } proccon =get_selinux_proc_context (argv[1 ], con);libselinux/utils/validatetrans.c +3
-0@@ -17,6 +17,16 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 );
libselinux/utils/validatetrans.c int main(int argc, char **argv) · line 32
Quoted 10 lines
libselinux/utils/validatetrans.c +7
-0+ } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) {fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);
You should check that argv[4] is a valid context as well.
Everything else looks good.
Jim
Quoted 3 lines
--
2.35.1
PATCH v2 1/1 libselinux/utils: check for valid contexts to improve error causes
In reply to Christian GöttscheReturn more detailed error messages when the supplied contexts are invalid.
---
v2:
check new context in validatetrans
--- libselinux/utils/compute_av.c | 10 ++++++++++ libselinux/utils/compute_create.c | 12 +++++++++++- libselinux/utils/compute_member.c | 12 +++++++++++- libselinux/utils/compute_relabel.c | 10 ++++++++++ libselinux/utils/getdefaultcon.c | 5 +++++ libselinux/utils/selinuxexeccon.c | 6 +++++- libselinux/utils/validatetrans.c | 15 +++++++++++++++ 7 files changed, 67 insertions(+), 3 deletions(-)
libselinux/utils/compute_av.c +10 -0
@@ -17,6 +17,16 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) {fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);
libselinux/utils/compute_create.c +11 -1
@@ -17,9 +17,19 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) { -fprintf (stderr,"Invalid class '%s'\n" , argv[3 ]); +fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);exit (2 ); }
libselinux/utils/compute_member.c +11 -1
@@ -17,9 +17,19 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) { -fprintf (stderr,"Invalid class '%s'\n" , argv[3 ]); +fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);exit (2 ); }
libselinux/utils/compute_relabel.c +10 -0
@@ -17,6 +17,16 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) {fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);
libselinux/utils/getdefaultcon.c +5 -0
@@ -68,6 +68,11 @@ int main(int argc, char **argv) }else cur_context = argv[optind +1 ]; +if (security_check_context (cur_context)) { +fprintf (stderr,"%s: invalid from context '%s'\n" , argv[0 ], cur_context); +return 3 ; + } +if ((ret =getseuser (user, service, &seuser, &dlevel)) ==0 ) {if (! level) level=dlevel;if (role !=NULL && role[0 ])
libselinux/utils/selinuxexeccon.c +5 -1
@@ -16,7 +16,7 @@ static __attribute__ ((__noreturn__)) void usage(const char *name, const char *dexit (rc); } -static char *get_selinux_proc_context (const char *command,char * execcon) { +static char *get_selinux_proc_context (const char *command,const char * execcon) {char * fcon =NULL , *newcon =NULL ;int ret =getfilecon (command, &fcon);
@@ -43,6 +43,10 @@ int main(int argc, char **argv) } }else { con =strdup (argv[2 ]); +if (security_check_context (con)) { +fprintf (stderr,"%s: invalid from context '%s'\n" , argv[0 ], con); +return -1 ; + } } proccon =get_selinux_proc_context (argv[1 ], con);
libselinux/utils/validatetrans.c +15 -0
@@ -17,12 +17,27 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) {fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);exit (2 ); } +if (security_check_context (argv[4 ])) { +fprintf (stderr,"%s: invalid new context '%s'\n" , argv[0 ], argv[4 ]); +exit (6 ); + } + ret =security_validatetrans (argv[1 ], argv[2 ], tclass, argv[4 ]);printf ("security_validatetrans returned %d errno: %s\n" , ret,strerror (errno));
Signature · 1 line
2.35.1
Quoted 5 lines · Christian Göttsche
Return more detailed error messages when the supplied contexts are invalid.
Signed-off-by Christian Göttsche <[email protected]>
Quoted 181 lines
---
v2:
check new context in validatetrans--- libselinux/utils/compute_av.c | 10 ++++++++++ libselinux/utils/compute_create.c | 12 +++++++++++- libselinux/utils/compute_member.c | 12 +++++++++++- libselinux/utils/compute_relabel.c | 10 ++++++++++ libselinux/utils/getdefaultcon.c | 5 +++++ libselinux/utils/selinuxexeccon.c | 6 +++++- libselinux/utils/validatetrans.c | 15 +++++++++++++++ 7 files changed, 67 insertions(+), 3 deletions(-)libselinux/utils/compute_av.c +10
-0@@ -17,6 +17,16 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) {fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);libselinux/utils/compute_create.c +11
-1@@ -17,9 +17,19 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) { -fprintf (stderr,"Invalid class '%s'\n" , argv[3 ]); +fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);exit (2 ); }libselinux/utils/compute_member.c +11
-1@@ -17,9 +17,19 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) { -fprintf (stderr,"Invalid class '%s'\n" , argv[3 ]); +fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);exit (2 ); }libselinux/utils/compute_relabel.c +10
-0@@ -17,6 +17,16 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) {fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);libselinux/utils/getdefaultcon.c +5
-0@@ -68,6 +68,11 @@ int main(int argc, char **argv) }else cur_context = argv[optind +1 ]; +if (security_check_context (cur_context)) { +fprintf (stderr,"%s: invalid from context '%s'\n" , argv[0 ], cur_context); +return 3 ; + } +if ((ret =getseuser (user, service, &seuser, &dlevel)) ==0 ) {if (! level) level=dlevel;if (role !=NULL && role[0 ])libselinux/utils/selinuxexeccon.c +5
-1@@ -16,7 +16,7 @@ static __attribute__ ((__noreturn__)) void usage(const char *name, const char *dexit (rc); } -static char *get_selinux_proc_context (const char *command,char * execcon) { +static char *get_selinux_proc_context (const char *command,const char * execcon) {char * fcon =NULL , *newcon =NULL ;int ret =getfilecon (command, &fcon);@@ -43,6 +43,10 @@ int main(int argc, char **argv) } }else { con =strdup (argv[2 ]); +if (security_check_context (con)) { +fprintf (stderr,"%s: invalid from context '%s'\n" , argv[0 ], con); +return -1 ; + } } proccon =get_selinux_proc_context (argv[1 ], con);libselinux/utils/validatetrans.c +15
-1@@ -17,12 +17,27 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) {fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);exit (2 ); } +if (security_check_context (argv[4 ])) { +fprintf (stderr,"%s: invalid new context '%s'\n" , argv[0 ], argv[4 ]); +exit (6 ); + } + ret =security_validatetrans (argv[1 ], argv[2 ], tclass, argv[4 ]);printf ("security_validatetrans returned %d errno: %s\n" , ret,strerror (errno)); --2.35.1
Quoted 11 lines · James Carter
Quoted 5 lines · Christian Göttsche
Return more detailed error messages when the supplied contexts are invalid.
Signed-off-by Christian Göttsche <[email protected]>Acked-by James Carter <[email protected]>
Merged.
Thanks,
Jim
Quoted 181 lines
Quoted 181 lines
---
v2:
check new context in validatetrans--- libselinux/utils/compute_av.c | 10 ++++++++++ libselinux/utils/compute_create.c | 12 +++++++++++- libselinux/utils/compute_member.c | 12 +++++++++++- libselinux/utils/compute_relabel.c | 10 ++++++++++ libselinux/utils/getdefaultcon.c | 5 +++++ libselinux/utils/selinuxexeccon.c | 6 +++++- libselinux/utils/validatetrans.c | 15 +++++++++++++++ 7 files changed, 67 insertions(+), 3 deletions(-)libselinux/utils/compute_av.c +10
-0@@ -17,6 +17,16 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) {fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);libselinux/utils/compute_create.c +11
-1@@ -17,9 +17,19 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) { -fprintf (stderr,"Invalid class '%s'\n" , argv[3 ]); +fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);exit (2 ); }libselinux/utils/compute_member.c +11
-1@@ -17,9 +17,19 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) { -fprintf (stderr,"Invalid class '%s'\n" , argv[3 ]); +fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);exit (2 ); }libselinux/utils/compute_relabel.c +10
-0@@ -17,6 +17,16 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) {fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);libselinux/utils/getdefaultcon.c +5
-0@@ -68,6 +68,11 @@ int main(int argc, char **argv) }else cur_context = argv[optind +1 ]; +if (security_check_context (cur_context)) { +fprintf (stderr,"%s: invalid from context '%s'\n" , argv[0 ], cur_context); +return 3 ; + } +if ((ret =getseuser (user, service, &seuser, &dlevel)) ==0 ) {if (! level) level=dlevel;if (role !=NULL && role[0 ])libselinux/utils/selinuxexeccon.c +5
-1@@ -16,7 +16,7 @@ static __attribute__ ((__noreturn__)) void usage(const char *name, const char *dexit (rc); } -static char *get_selinux_proc_context (const char *command,char * execcon) { +static char *get_selinux_proc_context (const char *command,const char * execcon) {char * fcon =NULL , *newcon =NULL ;int ret =getfilecon (command, &fcon);@@ -43,6 +43,10 @@ int main(int argc, char **argv) } }else { con =strdup (argv[2 ]); +if (security_check_context (con)) { +fprintf (stderr,"%s: invalid from context '%s'\n" , argv[0 ], con); +return -1 ; + } } proccon =get_selinux_proc_context (argv[1 ], con);libselinux/utils/validatetrans.c +15
-1@@ -17,12 +17,27 @@ int main(int argc, char **argv)exit (1 ); } +if (security_check_context (argv[1 ])) { +fprintf (stderr,"%s: invalid source context '%s'\n" , argv[0 ], argv[1 ]); +exit (4 ); + } + +if (security_check_context (argv[2 ])) { +fprintf (stderr,"%s: invalid target context '%s'\n" , argv[0 ], argv[2 ]); +exit (5 ); + } + tclass =string_to_security_class (argv[3 ]);if (!tclass) {fprintf (stderr,"%s: invalid class '%s'\n" , argv[0 ], argv[3 ]);exit (2 ); } +if (security_check_context (argv[4 ])) { +fprintf (stderr,"%s: invalid new context '%s'\n" , argv[0 ], argv[4 ]); +exit (6 ); + } + ret =security_validatetrans (argv[1 ], argv[2 ], tclass, argv[4 ]);printf ("security_validatetrans returned %d errno: %s\n" , ret,strerror (errno)); --2.35.1