openharmony/kernel_linux_common_modules
1
0
Fork 0
mirror of https://github.com/openharmony/kernel_linux_common_modules.git synced 2026-08-26 17:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

!76 fix：修复ELF文件验签失败的问题

Browse Source 
Merge pull request !76 from Hongjin Li/master
This commit is contained in:
openharmony_ci
2023-11-21 10:56:01 +00:00
committed by Gitee
parent 6728ee660e f24bb6d796
commit 62fd39d13c
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code_sign/code_sign_elf.c
+18 -3
View File
@@ -100,7 +100,7 @@ static int get_fsverity_desc(sign_block_t *sign_block, char *sign_data_ptr)
return 0;
}
static int enable_by_sign_head(struct file *fp, long long fsize, char *sign_head_ptr)
static int enable_by_sign_head(struct file *fp, struct inode *inode, long long fsize, char *sign_head_ptr)
{
sign_block_t sign_block;
memset(&sign_block, 0, sizeof(sign_block));
@@ -146,13 +146,28 @@ static int enable_by_sign_head(struct file *fp, long long fsize, char *sign_head
goto out;
}
err = mnt_want_write_file(fp);
if (err) /* -EROFS */
goto out;
err = deny_write_access(fp);
if (err) /* -ETXTBSY */
goto out_drop_write;
/* fsverity_enable_with_descriptor in fs/verity/enable.c */
err = fsverity_enable_with_descriptor(fp, (void *)(sign_block.fsverity_desc), sign_block.fsverity_desc_hdr.length);
if (err) {
code_sign_log_error("fsverity_enable_with_descriptor returns err: %d", err);
goto out;
goto out_allow_write_access;
}
filemap_write_and_wait(inode->i_mapping);
invalidate_inode_pages2(inode->i_mapping);
out_allow_write_access:
allow_write_access(fp);
out_drop_write:
mnt_drop_write_file(fp);
out:
kfree(sign_data_ptr);
return err;
@@ -233,7 +248,7 @@ int elf_file_enable_fs_verity(struct file *file)
goto release_sign_head_out;
}
err = enable_by_sign_head(fp, fsize, sign_head_ptr);
err = enable_by_sign_head(fp, inode, fsize, sign_head_ptr);
if (err) {
code_sign_log_error("enable_by_sign_head err: %d", err);
goto release_sign_head_out;