Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 09:12:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git

Browse Source
This commit is contained in:
Stephen Rothwell 2024-12-20 09:19:16 +11:00
commit f6e8d51a69
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ecryptfs/crypto.c
View File

@ -1292,7 +1292,7 @@ static int ecryptfs_read_headers_virt(char *page_virt,
/** /**
* ecryptfs_read_xattr_region * ecryptfs_read_xattr_region
* @page_virt: The vitual address into which to read the xattr data * @page_virt: The virtual address into which to read the xattr data
* @ecryptfs_inode: The eCryptfs inode * @ecryptfs_inode: The eCryptfs inode
* *
* Attempts to read the crypto metadata from the extended attribute * Attempts to read the crypto metadata from the extended attribute

1
fs/ecryptfs/ecryptfs_kernel.h
View File

@ -551,7 +551,6 @@ int ecryptfs_decode_and_decrypt_filename(char **decrypted_name,
size_t *decrypted_name_size, size_t *decrypted_name_size,
struct super_block *sb, struct super_block *sb,
const char *name, size_t name_size); const char *name, size_t name_size);
int ecryptfs_fill_zeros(struct file *file, loff_t new_length);
int ecryptfs_encrypt_and_encode_filename( int ecryptfs_encrypt_and_encode_filename(
char **encoded_name, char **encoded_name,
size_t *encoded_name_size, size_t *encoded_name_size,

4
fs/ecryptfs/keystore.c
View File

@ -355,7 +355,7 @@ parse_tag_67_packet(struct ecryptfs_key_record *key_rec,
int rc; int rc;
/* /*
* ***** TAG 65 Packet Format ***** * ***** TAG 67 Packet Format *****
* | Content Type | 1 byte | * | Content Type | 1 byte |
* | Status Indicator | 1 byte | * | Status Indicator | 1 byte |
* | Encrypted File Encryption Key Size | 1 or 2 bytes | * | Encrypted File Encryption Key Size | 1 or 2 bytes |
@ -880,7 +880,7 @@ struct ecryptfs_parse_tag_70_packet_silly_stack {
* @filename: This function kmalloc's the memory for the filename * @filename: This function kmalloc's the memory for the filename
* @filename_size: This function sets this to the amount of memory * @filename_size: This function sets this to the amount of memory
* kmalloc'd for the filename * kmalloc'd for the filename
* @packet_size: This function sets this to the the number of octets * @packet_size: This function sets this to the number of octets
* in the packet parsed * in the packet parsed
* @mount_crypt_stat: The mount-wide cryptographic context * @mount_crypt_stat: The mount-wide cryptographic context
* @data: The memory location containing the start of the tag 70 * @data: The memory location containing the start of the tag 70