From: Jiele zhao <unclexiaole@gmail.com>
To: keescook@chromium.org
Cc: jmorris@namei.org, serge@hallyn.com,
linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org, Jiele zhao <unclexiaole@gmail.com>
Subject: [PATCH v3] security/loadpin: Replace "kernel_read_file_str[j]" with function "kernel_read_file_id_str(j)".
Date: Fri, 5 Mar 2021 03:21:10 +0000 [thread overview]
Message-ID: <20210305032110.215024-1-unclexiaole@gmail.com> (raw)
Actually Linux kernel already provide function "kernel_read_file_id_str()"
for secure access in "kernel_read_file.h".
And, in "parse_exclude()" function, it's better to use
BUILD_BUG_ON(ARRAY_SIZE(kernel_read_file_str) - 1 !=
ARRAY_SIZE(ignore_read_file_id));
to make sure the arrays stay within expected sizes.
By the way, sorry for that mistake PATCH v2 file, I sent wrong path... ...
Signed-off-by: Jiele zhao <unclexiaole@gmail.com>
---
security/loadpin/loadpin.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/security/loadpin/loadpin.c b/security/loadpin/loadpin.c
index b12f7d986b1e..1c35164673b4 100644
--- a/security/loadpin/loadpin.c
+++ b/security/loadpin/loadpin.c
@@ -210,9 +210,10 @@ static void __init parse_exclude(void)
*/
BUILD_BUG_ON(ARRAY_SIZE(exclude_read_files) !=
ARRAY_SIZE(ignore_read_file_id));
- BUILD_BUG_ON(ARRAY_SIZE(kernel_read_file_str) <
+ BUILD_BUG_ON(ARRAY_SIZE(kernel_read_file_str) - 1 !=
ARRAY_SIZE(ignore_read_file_id));
+
for (i = 0; i < ARRAY_SIZE(exclude_read_files); i++) {
cur = exclude_read_files[i];
if (!cur)
@@ -221,9 +222,9 @@ static void __init parse_exclude(void)
continue;
for (j = 0; j < ARRAY_SIZE(ignore_read_file_id); j++) {
- if (strcmp(cur, kernel_read_file_str[j]) == 0) {
+ if (strcmp(cur, kernel_read_file_id_str(j)) == 0) {
pr_info("excluding: %s\n",
- kernel_read_file_str[j]);
+ kernel_read_file_id_str(j));
ignore_read_file_id[j] = 1;
/*
* Can not break, because one read_file_str
--
2.25.1
reply other threads:[~2021-03-05 3:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20210305032110.215024-1-unclexiaole@gmail.com \
--to=unclexiaole@gmail.com \
--cc=jmorris@namei.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=serge@hallyn.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).