diff options
author | Michael Halcrow <mhalcrow@us.ibm.com> | 2009-01-06 17:42:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 18:59:22 -0500 |
commit | a8f12864c52f8ab8520568dc97969c1749ae60bf (patch) | |
tree | 9b65cf578ce80fb0fc139371b7dd7594ed79a6f0 /fs/ecryptfs/crypto.c | |
parent | df261c52abdef147084c76ecf14473184e907547 (diff) |
eCryptfs: Fix data types (int/size_t)
Correct several format string data type specifiers. Correct filename size
data types; they should be size_t rather than int when passed as
parameters to some other functions (although note that the filenames will
never be larger than int).
Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
Cc: Dustin Kirkland <dustin.kirkland@gmail.com>
Cc: Eric Sandeen <sandeen@redhat.com>
Cc: Tyler Hicks <tchicks@us.ibm.com>
Cc: David Kleikamp <shaggy@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ecryptfs/crypto.c')
-rw-r--r-- | fs/ecryptfs/crypto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index 490b129311eb..e935a2224982 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c | |||
@@ -2093,7 +2093,7 @@ int ecryptfs_encrypt_and_encode_filename( | |||
2093 | filename = kzalloc(sizeof(*filename), GFP_KERNEL); | 2093 | filename = kzalloc(sizeof(*filename), GFP_KERNEL); |
2094 | if (!filename) { | 2094 | if (!filename) { |
2095 | printk(KERN_ERR "%s: Out of memory whilst attempting " | 2095 | printk(KERN_ERR "%s: Out of memory whilst attempting " |
2096 | "to kzalloc [%d] bytes\n", __func__, | 2096 | "to kzalloc [%zd] bytes\n", __func__, |
2097 | sizeof(*filename)); | 2097 | sizeof(*filename)); |
2098 | rc = -ENOMEM; | 2098 | rc = -ENOMEM; |
2099 | goto out; | 2099 | goto out; |
@@ -2127,7 +2127,7 @@ int ecryptfs_encrypt_and_encode_filename( | |||
2127 | (*encoded_name) = kmalloc((*encoded_name_size) + 1, GFP_KERNEL); | 2127 | (*encoded_name) = kmalloc((*encoded_name_size) + 1, GFP_KERNEL); |
2128 | if (!(*encoded_name)) { | 2128 | if (!(*encoded_name)) { |
2129 | printk(KERN_ERR "%s: Out of memory whilst attempting " | 2129 | printk(KERN_ERR "%s: Out of memory whilst attempting " |
2130 | "to kzalloc [%d] bytes\n", __func__, | 2130 | "to kzalloc [%zd] bytes\n", __func__, |
2131 | (*encoded_name_size)); | 2131 | (*encoded_name_size)); |
2132 | rc = -ENOMEM; | 2132 | rc = -ENOMEM; |
2133 | kfree(filename->encrypted_filename); | 2133 | kfree(filename->encrypted_filename); |