[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20220607093649.928131-1-gongruiqi1@huawei.com>
Date: Tue, 7 Jun 2022 17:36:49 +0800
From: "GONG, Ruiqi" <gongruiqi1@...wei.com>
To: Casey Schaufler <casey@...aufler-ca.com>,
James Morris <jmorris@...ei.org>,
"Serge E . Hallyn" <serge@...lyn.com>
CC: Kees Cook <keescook@...omium.org>,
<linux-security-module@...r.kernel.org>,
<linux-kernel@...r.kernel.org>,
"Wang Weiyang" <wangweiyang2@...wei.com>,
Xiu Jianfeng <xiujianfeng@...wei.com>,
Gong Ruiqi <gongruiqi1@...wei.com>
Subject: [RESEND PATCH] smack: Replace kzalloc + strncpy with kstrndup
Simplify the code by using kstrndup instead of kzalloc and strncpy in
smk_parse_smack(), which meanwhile remove strncpy as [1] suggests.
[1]: https://github.com/KSPP/linux/issues/90
Signed-off-by: GONG, Ruiqi <gongruiqi1@...wei.com>
---
Resend: fix email issue to make it acceptable by the mailing list
security/smack/smack_access.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c
index d2186e2757be..585e5e35710b 100644
--- a/security/smack/smack_access.c
+++ b/security/smack/smack_access.c
@@ -465,12 +465,9 @@ char *smk_parse_smack(const char *string, int len)
if (i == 0 || i >= SMK_LONGLABEL)
return ERR_PTR(-EINVAL);
- smack = kzalloc(i + 1, GFP_NOFS);
- if (smack == NULL)
+ smack = kstrndup(string, i, GFP_NOFS);
+ if (!smack)
return ERR_PTR(-ENOMEM);
-
- strncpy(smack, string, i);
-
return smack;
}
--
2.25.1
Powered by blists - more mailing lists