On Mon, 2018-05-21 at 19:58 +0800, Yisheng Xie wrote:
> match_string() returns the index of an array for a matching string,
> which can be used intead of open coded variant.
> 
> Cc: Mimi Zohar <zo...@linux.vnet.ibm.com>
> Cc: Dmitry Kasatkin <dmitry.kasat...@gmail.com>
> Cc: James Morris <jmor...@namei.org>
> Cc: "Serge E. Hallyn" <se...@hallyn.com>
> Cc: linux-integr...@vger.kernel.org
> Cc: linux-security-mod...@vger.kernel.org
> Signed-off-by: Yisheng Xie <xieyishe...@huawei.com>

Reviewed-by: Mimi Zohar <zo...@linux.vnet.ibm.com>

> ---
>  security/integrity/ima/ima_main.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/security/integrity/ima/ima_main.c 
> b/security/integrity/ima/ima_main.c
> index 74d0bd7..f807093 100644
> --- a/security/integrity/ima/ima_main.c
> +++ b/security/integrity/ima/ima_main.c
> @@ -61,14 +61,11 @@ static int __init hash_setup(char *str)
>               goto out;
>       }
> 
> -     for (i = 0; i < HASH_ALGO__LAST; i++) {
> -             if (strcmp(str, hash_algo_name[i]) == 0) {
> -                     ima_hash_algo = i;
> -                     break;
> -             }
> -     }
> -     if (i == HASH_ALGO__LAST)
> +     i = match_string(hash_algo_name, HASH_ALGO__LAST, str);
> +     if (i < 0)
>               return 1;
> +
> +     ima_hash_algo = i;
>  out:
>       hash_setup_done = 1;
>       return 1;

Reply via email to