From: Yisheng Xie <xieyisheng1@huawei.com>
To: <linux-kernel@vger.kernel.org>
Cc: Yisheng Xie <xieyisheng1@huawei.com>,
Mimi Zohar <zohar@linux.vnet.ibm.com>,
Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
<linux-integrity@vger.kernel.org>,
<linux-security-module@vger.kernel.org>
Subject: [PATCH 25/33] ima: use match_string() helper
Date: Mon, 21 May 2018 19:58:02 +0800 [thread overview]
Message-ID: <1526903890-35761-26-git-send-email-xieyisheng1@huawei.com> (raw)
In-Reply-To: <1526903890-35761-1-git-send-email-xieyisheng1@huawei.com>
match_string() returns the index of an array for a matching string,
which can be used intead of open coded variant.
Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
Cc: Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
Cc: James Morris <jmorris@namei.org>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: linux-integrity@vger.kernel.org
Cc: linux-security-module@vger.kernel.org
Signed-off-by: Yisheng Xie <xieyisheng1@huawei.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;
--
1.7.12.4
next prev parent reply other threads:[~2018-05-21 12:09 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-21 11:57 [PATCH 00/33] use match_string() helper Yisheng Xie
2018-05-21 11:57 ` [PATCH 01/33] usb: phy: " Yisheng Xie
2018-05-21 22:20 ` Andy Shevchenko
2018-05-22 10:02 ` Greg Kroah-Hartman
2018-05-22 11:12 ` Yisheng Xie
2018-05-21 11:57 ` [PATCH 02/33] mfd: omap-usb-host: " Yisheng Xie
2018-05-21 17:41 ` Tony Lindgren
2018-06-04 6:15 ` Lee Jones
2018-05-21 11:57 ` [PATCH 03/33] Staging: gdm724x: " Yisheng Xie
2018-05-21 21:35 ` Andy Shevchenko
2018-05-21 11:57 ` [PATCH 04/33] gpiolib-of: " Yisheng Xie
2018-05-21 21:36 ` Andy Shevchenko
2018-05-21 11:57 ` [PATCH 05/33] cxgb4: " Yisheng Xie
2018-05-21 21:39 ` Andy Shevchenko
2018-05-22 0:55 ` Yisheng Xie
2018-05-21 11:57 ` [PATCH 06/33] hp100: " Yisheng Xie
2018-05-21 11:57 ` [PATCH 07/33] iwlwifi: mvm: " Yisheng Xie
2018-05-21 20:12 ` Luca Coelho
2018-05-21 21:43 ` Andy Shevchenko
2018-05-22 3:30 ` Yisheng Xie
2018-05-22 20:41 ` Andy Shevchenko
2018-05-21 11:57 ` [PATCH 08/33] vfio: " Yisheng Xie
2018-05-25 20:55 ` Alex Williamson
2018-05-21 11:57 ` [PATCH 09/33] phy: tegra: " Yisheng Xie
2018-05-21 21:45 ` Andy Shevchenko
2018-05-21 11:57 ` [PATCH 10/33] pata_hpt37x: " Yisheng Xie
2018-05-21 21:46 ` Andy Shevchenko
2018-05-21 11:57 ` [PATCH 11/33] bus: fsl-mc: " Yisheng Xie
2018-05-21 11:57 ` [PATCH 12/33] clk: bcm2835: " Yisheng Xie
2018-05-21 17:48 ` Eric Anholt
2018-05-21 21:50 ` Andy Shevchenko
2018-05-22 3:42 ` Yisheng Xie
2018-05-21 11:57 ` [PATCH 13/33] clk: rockchip: " Yisheng Xie
2018-05-22 13:56 ` Heiko Stuebner
2018-05-21 11:57 ` [PATCH 14/33] clk: " Yisheng Xie
2018-05-21 21:53 ` Andy Shevchenko
2018-05-21 11:57 ` [PATCH 15/33] cpufreq: intel_pstate: " Yisheng Xie
2018-05-21 11:57 ` [PATCH 16/33] mmc: sdhci-xenon: " Yisheng Xie
2018-05-24 7:58 ` Adrian Hunter
2018-05-28 11:27 ` Ulf Hansson
2018-05-21 11:57 ` [PATCH 17/33] pinctrl: armada-37xx: " Yisheng Xie
2018-05-21 21:55 ` Andy Shevchenko
2018-05-21 11:57 ` [PATCH 18/33] power: supply: " Yisheng Xie
2018-05-21 21:58 ` Andy Shevchenko
2018-05-22 16:16 ` Sebastian Reichel
2018-05-21 11:57 ` [PATCH 19/33] thermal: db8500: " Yisheng Xie
2018-05-21 22:00 ` Andy Shevchenko
2018-05-23 7:47 ` Yisheng Xie
2018-06-05 16:14 ` Andy Shevchenko
2018-05-21 11:57 ` [PATCH 20/33] video: fbdev: pxafb: " Yisheng Xie
2018-05-21 22:01 ` Andy Shevchenko
2018-05-21 11:57 ` [PATCH 21/33] drm/nouveau: " Yisheng Xie
2018-05-21 22:03 ` Andy Shevchenko
2018-05-21 11:57 ` [PATCH 22/33] drm/i915: " Yisheng Xie
2018-05-21 22:04 ` Andy Shevchenko
2018-05-22 8:36 ` Jani Nikula
2018-05-22 9:22 ` Yisheng Xie
2018-05-21 11:58 ` [PATCH 23/33] drm: i2c: ch7006: " Yisheng Xie
2018-05-21 11:58 ` [PATCH 24/33] drm: " Yisheng Xie
2018-05-21 22:06 ` Andy Shevchenko
2018-05-22 8:39 ` Jani Nikula
2018-05-21 11:58 ` Yisheng Xie [this message]
2018-05-23 14:42 ` [PATCH 25/33] ima: " Mimi Zohar
2018-05-21 11:58 ` [PATCH 26/33] apparmor: " Yisheng Xie
2018-05-21 15:33 ` John Johansen
2018-05-22 1:25 ` Yisheng Xie
2018-05-21 22:10 ` Andy Shevchenko
2018-05-21 11:58 ` [PATCH 27/33] sched/debug: " Yisheng Xie
2018-05-21 22:13 ` Andy Shevchenko
2018-05-22 12:10 ` Yisheng Xie
2018-05-22 20:29 ` Andy Shevchenko
2018-05-21 11:58 ` [PATCH 28/33] ALSA: dice " Yisheng Xie
2018-05-21 22:31 ` Takashi Sakamoto
2018-05-21 11:58 ` [PATCH 29/33] ALSA: oxfw: " Yisheng Xie
2018-05-21 22:26 ` [alsa-devel] " Takashi Sakamoto
2018-05-22 7:26 ` Takashi Iwai
2018-05-21 11:58 ` [PATCH 30/33] ALSA: oxygen: " Yisheng Xie
2018-05-21 22:23 ` Andy Shevchenko
2018-05-21 11:58 ` [PATCH 31/33] ASoC: max98088: " Yisheng Xie
2018-05-21 22:24 ` Andy Shevchenko
2018-05-22 12:30 ` Yisheng Xie
2018-05-22 17:23 ` Andy Shevchenko
2018-05-21 11:58 ` [PATCH 32/33] ASoC: max98095: " Yisheng Xie
2018-05-21 22:25 ` Andy Shevchenko
2018-05-21 11:58 ` [PATCH 33/33] ASoC: dapm: " Yisheng Xie
2018-05-31 16:09 ` Applied "ASoC: dapm: use match_string() helper" to the asoc tree Mark Brown
2018-05-21 22:27 ` [PATCH 00/33] use match_string() helper Andy Shevchenko
2018-05-22 0:52 ` Yisheng Xie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1526903890-35761-26-git-send-email-xieyisheng1@huawei.com \
--to=xieyisheng1@huawei.com \
--cc=dmitry.kasatkin@gmail.com \
--cc=jmorris@namei.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=serge@hallyn.com \
--cc=zohar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).