[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1527778958.3427.16.camel@linux.vnet.ibm.com>
Date: Thu, 31 May 2018 11:02:38 -0400
From: Mimi Zohar <zohar@...ux.vnet.ibm.com>
To: Yisheng Xie <xieyisheng1@...wei.com>, linux-kernel@...r.kernel.org
Cc: andy.shevchenko@...il.com,
Dmitry Kasatkin <dmitry.kasatkin@...il.com>,
James Morris <jmorris@...ei.org>,
"Serge E. Hallyn" <serge@...lyn.com>,
linux-integrity@...r.kernel.org,
linux-security-module@...r.kernel.org
Subject: Re: [PATCH v2 13/21] ima: use match_string() helper
On Thu, 2018-05-31 at 19:11 +0800, Yisheng Xie wrote:
> match_string() returns the index of an array for a matching string,
> which can be used instead of open coded variant.
>
> Reviewed-by: Mimi Zohar <zohar@...ux.vnet.ibm.com>
> Reviewed-by: Andy Shevchenko <andy.shevchenko@...il.com>
> Cc: Mimi Zohar <zohar@...ux.vnet.ibm.com>
> Cc: Dmitry Kasatkin <dmitry.kasatkin@...il.com>
> Cc: James Morris <jmorris@...ei.org>
> Cc: "Serge E. Hallyn" <serge@...lyn.com>
> Cc: linux-integrity@...r.kernel.org
> Cc: linux-security-module@...r.kernel.org
> Signed-off-by: Yisheng Xie <xieyisheng1@...wei.com>
In the future, the patch's author Signed-off-by is always first.
Thanks, this patch is now queued in the next-integrity branch.
Mimi
> ---
> v2:
> - add Reviewed-by tag.
>
> 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;
Powered by blists - more mailing lists