From 708ed86a778c6018ce1f7aceefd41c9fa19d665e Mon Sep 17 00:00:00 2001 From: Michael Halcrow Date: Tue, 6 Jan 2009 14:42:04 -0800 Subject: [PATCH] --- yaml --- r: 126355 b: refs/heads/master c: 7d8bc2be51706152828164b305e969b4a8471041 h: refs/heads/master i: 126353: 0557ad6f9cab3f684db803f3e264a3fc68208e80 126351: 84e4df2f07ff9d4079667aee83127a36a9c10b56 v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/keystore.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fe0929ba3610..ae6538320405 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8f12864c52f8ab8520568dc97969c1749ae60bf +refs/heads/master: 7d8bc2be51706152828164b305e969b4a8471041 diff --git a/trunk/fs/ecryptfs/keystore.c b/trunk/fs/ecryptfs/keystore.c index c90ca5dfc506..ff539420cc6f 100644 --- a/trunk/fs/ecryptfs/keystore.c +++ b/trunk/fs/ecryptfs/keystore.c @@ -771,6 +771,17 @@ struct ecryptfs_parse_tag_70_packet_silly_stack { /** * parse_tag_70_packet - Parse and process FNEK-encrypted passphrase packet * @filename: This function kmalloc's the memory for the filename + * @filename_size: This function sets this to the amount of memory + * kmalloc'd for the filename + * @packet_size: This function sets this to the the number of octets + * in the packet parsed + * @mount_crypt_stat: The mount-wide cryptographic context + * @data: The memory location containing the start of the tag 70 + * packet + * @max_packet_size: The maximum legal size of the packet to be parsed + * from @data + * + * Returns zero on success; non-zero otherwise */ int ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,