From: Juergen Gross Date: Wed, 23 Aug 2017 17:36:00 +0000 (+0200) Subject: xen/xsm/flask/flask_op.c: let custom parameter parsing routines return errno X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1568 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bcd53c648d8a3dd8125dc451143f95ab19a3b552;p=xen.git xen/xsm/flask/flask_op.c: let custom parameter parsing routines return errno Modify the custom parameter parsing routines in: xen/xsm/flask/flask_op.c to indicate whether the parameter value was parsed successfully. Signed-off-by: Juergen Gross Acked-by: Daniel De Graaf Acked-by: Wei Liu --- diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 15aa96b09f..03baa28b68 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -26,7 +26,7 @@ #define _copy_from_guest copy_from_guest enum flask_bootparam_t __read_mostly flask_bootparam = FLASK_BOOTPARAM_ENFORCING; -static void parse_flask_param(char *s); +static int parse_flask_param(const char *s); custom_param("flask", parse_flask_param); bool __read_mostly flask_enforcing = true; @@ -58,7 +58,7 @@ static int flask_security_make_bools(void); extern int ss_initialized; -static void __init parse_flask_param(char *s) +static int __init parse_flask_param(const char *s) { if ( !strcmp(s, "enforcing") ) flask_bootparam = FLASK_BOOTPARAM_ENFORCING; @@ -70,6 +70,8 @@ static void __init parse_flask_param(char *s) flask_bootparam = FLASK_BOOTPARAM_PERMISSIVE; else flask_bootparam = FLASK_BOOTPARAM_INVALID; + + return (flask_bootparam == FLASK_BOOTPARAM_INVALID) ? -EINVAL : 0; } static int domain_has_security(struct domain *d, u32 perms)