From: Wei Yongjun weiyongjun1@huawei.com
mainline inclusion from mainline-v5.12-rc1 commit f6692213b5045dc461ce0858fb18cf46f328c202 category: bugfix bugzilla: 187303, https://gitee.com/openeuler/kernel/issues/I5ZXPC CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=...
-------------------------------
The sparse tool complains as follows:
security/integrity/digsig.c:146:12: warning: symbol 'integrity_add_key' was not declared. Should it be static?
This function is not used outside of digsig.c, so this commit marks it static.
Reported-by: Hulk Robot hulkci@huawei.com Fixes: 60740accf784 ("integrity: Load certs to the platform keyring") Signed-off-by: Wei Yongjun weiyongjun1@huawei.com Reviewed-by: Kees Cook keescook@chromium.org Reviewed-by: Nayna Jain nayna@linux.ibm.com Signed-off-by: Mimi Zohar zohar@linux.ibm.com Signed-off-by: Cai Xinchen caixinchen1@huawei.com Reviewed-by: Wang Weiyang wangweiyang2@huawei.com Reviewed-by: GUO Zihua guozihua@huawei.com Reviewed-by: Xiu Jianfeng xiujianfeng@huawei.com Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com --- security/integrity/digsig.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c index 0f518dcfde05..250fb0836156 100644 --- a/security/integrity/digsig.c +++ b/security/integrity/digsig.c @@ -143,8 +143,8 @@ int __init integrity_init_keyring(const unsigned int id) return __integrity_init_keyring(id, perm, restriction); }
-int __init integrity_add_key(const unsigned int id, const void *data, - off_t size, key_perm_t perm) +static int __init integrity_add_key(const unsigned int id, const void *data, + off_t size, key_perm_t perm) { key_ref_t key; int rc = 0;