ima: use match_string() helper
authorYisheng Xie <xieyisheng1@huawei.com>
Mon, 21 May 2018 11:58:02 +0000 (19:58 +0800)
committerMimi Zohar <zohar@linux.vnet.ibm.com>
Thu, 31 May 2018 14:11:58 +0000 (10:11 -0400)
match_string() returns the index of an array for a matching string,
which can be used intead of open coded variant.

Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
security/integrity/ima/ima_main.c

index 83f84928ad760f0cb64eec5be7ecfe020aea2243..dca44cf7838eaddf882212faedc9759a391f7723 100644 (file)
@@ -59,14 +59,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;