Merge branch 'topic/hwdep-cleanup' into topic/hdsp

[linux-2.6-omap-h63xx.git] / fs / ecryptfs / keystore.c

diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index dafceb5560e5682c11cc005c0c80adf307c6ae7a..ff539420cc6f0f4f319bd37ebe82123ae3c691d2 100644 (file)
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -358,7 +358,7 @@ parse_tag_67_packet(struct ecryptfs_key_record *key_rec,
        /* verify that everything through the encrypted FEK size is present */
        if (message_len < 4) {
                rc = -EIO;
-               printk(KERN_ERR "%s: message_len is [%Zd]; minimum acceptable "
+               printk(KERN_ERR "%s: message_len is [%zd]; minimum acceptable "
                       "message length is [%d]\n", __func__, message_len, 4);
                goto out;
        }
@@ -385,13 +385,13 @@ parse_tag_67_packet(struct ecryptfs_key_record *key_rec,
        i += data_len;
        if (message_len < (i + key_rec->enc_key_size)) {
                rc = -EIO;
-               printk(KERN_ERR "%s: message_len [%Zd]; max len is [%Zd]\n",
+               printk(KERN_ERR "%s: message_len [%zd]; max len is [%zd]\n",
                       __func__, message_len, (i + key_rec->enc_key_size));
                goto out;
        }
        if (key_rec->enc_key_size > ECRYPTFS_MAX_ENCRYPTED_KEY_BYTES) {
                rc = -EIO;
-               printk(KERN_ERR "%s: Encrypted key_size [%Zd] larger than "
+               printk(KERN_ERR "%s: Encrypted key_size [%zd] larger than "
                       "the maximum key size [%d]\n", __func__,
                       key_rec->enc_key_size,
                       ECRYPTFS_MAX_ENCRYPTED_KEY_BYTES);
@@ -511,7 +511,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,
        s = kmalloc(sizeof(*s), GFP_KERNEL);
        if (!s) {
                printk(KERN_ERR "%s: Out of memory whilst trying to kmalloc "
-                      "[%d] bytes of kernel memory\n", __func__, sizeof(*s));
+                      "[%zd] bytes of kernel memory\n", __func__, sizeof(*s));
                goto out;
        }
        s->desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;
@@ -556,8 +556,8 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,
                goto out_unlock;
        }
        if (s->max_packet_size > (*remaining_bytes)) {
-               printk(KERN_WARNING "%s: Require [%d] bytes to write; only "
-                      "[%d] available\n", __func__, s->max_packet_size,
+               printk(KERN_WARNING "%s: Require [%zd] bytes to write; only "
+                      "[%zd] available\n", __func__, s->max_packet_size,
                       (*remaining_bytes));
                rc = -EINVAL;
                goto out_unlock;
@@ -566,7 +566,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,
                                            GFP_KERNEL);
        if (!s->block_aligned_filename) {
                printk(KERN_ERR "%s: Out of kernel memory whilst attempting to "
-                      "kzalloc [%Zd] bytes\n", __func__,
+                      "kzalloc [%zd] bytes\n", __func__,
                       s->block_aligned_filename_size);
                rc = -ENOMEM;
                goto out_unlock;
@@ -594,7 +594,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,
                mount_crypt_stat->global_default_fn_cipher_key_bytes);
        if (s->cipher_code == 0) {
                printk(KERN_WARNING "%s: Unable to generate code for "
-                      "cipher [%s] with key bytes [%d]\n", __func__,
+                      "cipher [%s] with key bytes [%zd]\n", __func__,
                       mount_crypt_stat->global_default_fn_cipher_name,
                       mount_crypt_stat->global_default_fn_cipher_key_bytes);
                rc = -EINVAL;
@@ -693,7 +693,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,
                printk(KERN_ERR "%s: Internal error whilst attempting to "
                       "convert filename memory to scatterlist; "
                       "expected rc = 1; got rc = [%d]. "
-                      "block_aligned_filename_size = [%d]\n", __func__, rc,
+                      "block_aligned_filename_size = [%zd]\n", __func__, rc,
                       s->block_aligned_filename_size);
                goto out_release_free_unlock;
        }
@@ -703,7 +703,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,
                printk(KERN_ERR "%s: Internal error whilst attempting to "
                       "convert encrypted filename memory to scatterlist; "
                       "expected rc = 1; got rc = [%d]. "
-                      "block_aligned_filename_size = [%d]\n", __func__, rc,
+                      "block_aligned_filename_size = [%zd]\n", __func__, rc,
                       s->block_aligned_filename_size);
                goto out_release_free_unlock;
        }
@@ -721,7 +721,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,
                printk(KERN_ERR "%s: Error setting key for crypto context; "
                       "rc = [%d]. s->auth_tok->token.password.session_key_"
                       "encryption_key = [0x%p]; mount_crypt_stat->"
-                      "global_default_fn_cipher_key_bytes = [%Zd]\n", __func__,
+                      "global_default_fn_cipher_key_bytes = [%zd]\n", __func__,
                       rc,
                       s->auth_tok->token.password.session_key_encryption_key,
                       mount_crypt_stat->global_default_fn_cipher_key_bytes);
@@ -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,
@@ -787,12 +798,12 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
        s = kmalloc(sizeof(*s), GFP_KERNEL);
        if (!s) {
                printk(KERN_ERR "%s: Out of memory whilst trying to kmalloc "
-                      "[%d] bytes of kernel memory\n", __func__, sizeof(*s));
+                      "[%zd] bytes of kernel memory\n", __func__, sizeof(*s));
                goto out;
        }
        s->desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;
        if (max_packet_size < (1 + 1 + ECRYPTFS_SIG_SIZE + 1 + 1)) {
-               printk(KERN_WARNING "%s: max_packet_size is [%Zd]; it must be "
+               printk(KERN_WARNING "%s: max_packet_size is [%zd]; it must be "
                       "at least [%d]\n", __func__, max_packet_size,
                        (1 + 1 + ECRYPTFS_SIG_SIZE + 1 + 1));
                rc = -EINVAL;
@@ -825,8 +836,8 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
                                          - ECRYPTFS_SIG_SIZE - 1);
        if ((1 + s->packet_size_len + s->parsed_tag_70_packet_size)
            > max_packet_size) {
-               printk(KERN_WARNING "%s: max_packet_size is [%d]; real packet "
-                      "size is [%d]\n", __func__, max_packet_size,
+               printk(KERN_WARNING "%s: max_packet_size is [%zd]; real packet "
+                      "size is [%zd]\n", __func__, max_packet_size,
                       (1 + s->packet_size_len + 1
                        + s->block_aligned_filename_size));
                rc = -EINVAL;
@@ -860,7 +871,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
                printk(KERN_ERR "%s: Internal error whilst attempting to "
                       "convert encrypted filename memory to scatterlist; "
                       "expected rc = 1; got rc = [%d]. "
-                      "block_aligned_filename_size = [%d]\n", __func__, rc,
+                      "block_aligned_filename_size = [%zd]\n", __func__, rc,
                       s->block_aligned_filename_size);
                goto out_unlock;
        }
@@ -869,7 +880,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
                                        GFP_KERNEL);
        if (!s->decrypted_filename) {
                printk(KERN_ERR "%s: Out of memory whilst attempting to "
-                      "kmalloc [%d] bytes\n", __func__,
+                      "kmalloc [%zd] bytes\n", __func__,
                       s->block_aligned_filename_size);
                rc = -ENOMEM;
                goto out_unlock;
@@ -880,7 +891,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
                printk(KERN_ERR "%s: Internal error whilst attempting to "
                       "convert decrypted filename memory to scatterlist; "
                       "expected rc = 1; got rc = [%d]. "
-                      "block_aligned_filename_size = [%d]\n", __func__, rc,
+                      "block_aligned_filename_size = [%zd]\n", __func__, rc,
                       s->block_aligned_filename_size);
                goto out_free_unlock;
        }
@@ -909,7 +920,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
                printk(KERN_ERR "%s: Error setting key for crypto context; "
                       "rc = [%d]. s->auth_tok->token.password.session_key_"
                       "encryption_key = [0x%p]; mount_crypt_stat->"
-                      "global_default_fn_cipher_key_bytes = [%Zd]\n", __func__,
+                      "global_default_fn_cipher_key_bytes = [%zd]\n", __func__,
                       rc,
                       s->auth_tok->token.password.session_key_encryption_key,
                       mount_crypt_stat->global_default_fn_cipher_key_bytes);
@@ -936,7 +947,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
        s->i++;
        (*filename_size) = (s->block_aligned_filename_size - s->i);
        if (!((*filename_size) > 0 && (*filename_size < PATH_MAX))) {
-               printk(KERN_WARNING "%s: Filename size is [%Zd], which is "
+               printk(KERN_WARNING "%s: Filename size is [%zd], which is "
                       "invalid\n", __func__, (*filename_size));
                rc = -EINVAL;
                goto out_free_unlock;
@@ -944,7 +955,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
        (*filename) = kmalloc(((*filename_size) + 1), GFP_KERNEL);
        if (!(*filename)) {
                printk(KERN_ERR "%s: Out of memory whilst attempting to "
-                      "kmalloc [%d] bytes\n", __func__,
+                      "kmalloc [%zd] bytes\n", __func__,
                       ((*filename_size) + 1));
                rc = -ENOMEM;
                goto out_free_unlock;