mirror of https://github.com/OpenIPC/firmware.git
70 lines
1.8 KiB
Diff
70 lines
1.8 KiB
Diff
diff -drupN a/fs/ext4/symlink.c b/fs/ext4/symlink.c
|
|
--- a/fs/ext4/symlink.c 2018-08-06 17:23:04.000000000 +0300
|
|
+++ b/fs/ext4/symlink.c 2022-06-12 05:28:14.000000000 +0300
|
|
@@ -27,59 +27,28 @@ static const char *ext4_encrypted_get_li
|
|
struct delayed_call *done)
|
|
{
|
|
struct page *cpage = NULL;
|
|
- char *caddr, *paddr = NULL;
|
|
- struct fscrypt_str cstr, pstr;
|
|
- struct fscrypt_symlink_data *sd;
|
|
- int res;
|
|
- u32 max_size = inode->i_sb->s_blocksize;
|
|
+ const void *caddr;
|
|
+ unsigned int max_size;
|
|
+ const char *paddr;
|
|
|
|
if (!dentry)
|
|
return ERR_PTR(-ECHILD);
|
|
|
|
- res = fscrypt_get_encryption_info(inode);
|
|
- if (res)
|
|
- return ERR_PTR(res);
|
|
-
|
|
if (ext4_inode_is_fast_symlink(inode)) {
|
|
- caddr = (char *) EXT4_I(inode)->i_data;
|
|
+ caddr = EXT4_I(inode)->i_data;
|
|
max_size = sizeof(EXT4_I(inode)->i_data);
|
|
} else {
|
|
cpage = read_mapping_page(inode->i_mapping, 0, NULL);
|
|
if (IS_ERR(cpage))
|
|
return ERR_CAST(cpage);
|
|
caddr = page_address(cpage);
|
|
+ max_size = inode->i_sb->s_blocksize;
|
|
}
|
|
|
|
- /* Symlink is encrypted */
|
|
- sd = (struct fscrypt_symlink_data *)caddr;
|
|
- cstr.name = sd->encrypted_path;
|
|
- cstr.len = le16_to_cpu(sd->len);
|
|
- if ((cstr.len + sizeof(struct fscrypt_symlink_data) - 1) > max_size) {
|
|
- /* Symlink data on the disk is corrupted */
|
|
- res = -EFSCORRUPTED;
|
|
- goto errout;
|
|
- }
|
|
-
|
|
- res = fscrypt_fname_alloc_buffer(inode, cstr.len, &pstr);
|
|
- if (res)
|
|
- goto errout;
|
|
- paddr = pstr.name;
|
|
-
|
|
- res = fscrypt_fname_disk_to_usr(inode, 0, 0, &cstr, &pstr);
|
|
- if (res)
|
|
- goto errout;
|
|
-
|
|
- /* Null-terminate the name */
|
|
- paddr[pstr.len] = '\0';
|
|
+ paddr = fscrypt_get_symlink(inode, caddr, max_size, done);
|
|
if (cpage)
|
|
put_page(cpage);
|
|
- set_delayed_call(done, kfree_link, paddr);
|
|
return paddr;
|
|
-errout:
|
|
- if (cpage)
|
|
- put_page(cpage);
|
|
- kfree(paddr);
|
|
- return ERR_PTR(res);
|
|
}
|
|
|
|
const struct inode_operations ext4_encrypted_symlink_inode_operations = {
|