2019-07-29 15:18:10

by Chuhong Yuan

[permalink] [raw]
Subject: [PATCH 11/12] userns: Replace strncmp with str_has_prefix

strncmp(str, const, len) is error-prone.
We had better use newly introduced
str_has_prefix() instead of it.

Signed-off-by: Chuhong Yuan <[email protected]>
---
kernel/user_namespace.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 8eadadc478f9..4a06ba563531 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -1153,11 +1153,10 @@ ssize_t proc_setgroups_write(struct file *file, const char __user *buf,

/* What is being requested? */
ret = -EINVAL;
- if (strncmp(pos, "allow", 5) == 0) {
+ if (str_has_prefix(pos, "allow")) {
pos += 5;
setgroups_allowed = true;
- }
- else if (strncmp(pos, "deny", 4) == 0) {
+ } else if (str_has_prefix(pos, "deny")) {
pos += 4;
setgroups_allowed = false;
}
--
2.20.1