ima: Use strscpy instead of strlcpy

strlcpy is deprecated, use its safer replacement.

Signed-off-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>

diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
index 2c6c3a5..a64fb01 100644 (file)
--- a/security/integrity/ima/ima_api.c
+++ b/security/integrity/ima/ima_api.c
@@ -403,7 +403,7 @@ const char *ima_d_path(const struct path *path, char **pathbuf, char *namebuf)
        }
 
        if (!pathname) {
-               strlcpy(namebuf, path->dentry->d_name.name, NAME_MAX);
+               strscpy(namebuf, path->dentry->d_name.name, NAME_MAX);
                pathname = namebuf;
        }
 

diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index fd7df7f..320ca80 100644 (file)
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -870,7 +870,7 @@ static int __init ima_init_arch_policy(void)
                char rule[255];
                int result;
 
-               result = strlcpy(rule, *rules, sizeof(rule));
+               result = strscpy(rule, *rules, sizeof(rule));
 
                INIT_LIST_HEAD(&arch_policy_entry[i].list);
                result = ima_parse_rule(rule, &arch_policy_entry[i]);