diff options
author | Michael Halcrow <mhalcrow@us.ibm.com> | 2009-01-06 17:42:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 18:59:22 -0500 |
commit | df261c52abdef147084c76ecf14473184e907547 (patch) | |
tree | f1f423ba612dbacace82193f2b088252f169a9c6 /fs/ecryptfs/keystore.c | |
parent | 87c94c4df0149786ad91d8a03c738a03369ee9c8 (diff) |
eCryptfs: Replace %Z with %z
%Z is a gcc-ism. Using %z instead.
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/keystore.c')
-rw-r--r-- | fs/ecryptfs/keystore.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c index dafceb5560e5..e6a96e8f5e67 100644 --- a/fs/ecryptfs/keystore.c +++ b/fs/ecryptfs/keystore.c | |||
@@ -358,7 +358,7 @@ parse_tag_67_packet(struct ecryptfs_key_record *key_rec, | |||
358 | /* verify that everything through the encrypted FEK size is present */ | 358 | /* verify that everything through the encrypted FEK size is present */ |
359 | if (message_len < 4) { | 359 | if (message_len < 4) { |
360 | rc = -EIO; | 360 | rc = -EIO; |
361 | printk(KERN_ERR "%s: message_len is [%Zd]; minimum acceptable " | 361 | printk(KERN_ERR "%s: message_len is [%zd]; minimum acceptable " |
362 | "message length is [%d]\n", __func__, message_len, 4); | 362 | "message length is [%d]\n", __func__, message_len, 4); |
363 | goto out; | 363 | goto out; |
364 | } | 364 | } |
@@ -385,13 +385,13 @@ parse_tag_67_packet(struct ecryptfs_key_record *key_rec, | |||
385 | i += data_len; | 385 | i += data_len; |
386 | if (message_len < (i + key_rec->enc_key_size)) { | 386 | if (message_len < (i + key_rec->enc_key_size)) { |
387 | rc = -EIO; | 387 | rc = -EIO; |
388 | printk(KERN_ERR "%s: message_len [%Zd]; max len is [%Zd]\n", | 388 | printk(KERN_ERR "%s: message_len [%zd]; max len is [%zd]\n", |
389 | __func__, message_len, (i + key_rec->enc_key_size)); | 389 | __func__, message_len, (i + key_rec->enc_key_size)); |
390 | goto out; | 390 | goto out; |
391 | } | 391 | } |
392 | if (key_rec->enc_key_size > ECRYPTFS_MAX_ENCRYPTED_KEY_BYTES) { | 392 | if (key_rec->enc_key_size > ECRYPTFS_MAX_ENCRYPTED_KEY_BYTES) { |
393 | rc = -EIO; | 393 | rc = -EIO; |
394 | printk(KERN_ERR "%s: Encrypted key_size [%Zd] larger than " | 394 | printk(KERN_ERR "%s: Encrypted key_size [%zd] larger than " |
395 | "the maximum key size [%d]\n", __func__, | 395 | "the maximum key size [%d]\n", __func__, |
396 | key_rec->enc_key_size, | 396 | key_rec->enc_key_size, |
397 | ECRYPTFS_MAX_ENCRYPTED_KEY_BYTES); | 397 | ECRYPTFS_MAX_ENCRYPTED_KEY_BYTES); |
@@ -511,7 +511,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes, | |||
511 | s = kmalloc(sizeof(*s), GFP_KERNEL); | 511 | s = kmalloc(sizeof(*s), GFP_KERNEL); |
512 | if (!s) { | 512 | if (!s) { |
513 | printk(KERN_ERR "%s: Out of memory whilst trying to kmalloc " | 513 | printk(KERN_ERR "%s: Out of memory whilst trying to kmalloc " |
514 | "[%d] bytes of kernel memory\n", __func__, sizeof(*s)); | 514 | "[%zd] bytes of kernel memory\n", __func__, sizeof(*s)); |
515 | goto out; | 515 | goto out; |
516 | } | 516 | } |
517 | s->desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP; | 517 | s->desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP; |
@@ -566,7 +566,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes, | |||
566 | GFP_KERNEL); | 566 | GFP_KERNEL); |
567 | if (!s->block_aligned_filename) { | 567 | if (!s->block_aligned_filename) { |
568 | printk(KERN_ERR "%s: Out of kernel memory whilst attempting to " | 568 | printk(KERN_ERR "%s: Out of kernel memory whilst attempting to " |
569 | "kzalloc [%Zd] bytes\n", __func__, | 569 | "kzalloc [%zd] bytes\n", __func__, |
570 | s->block_aligned_filename_size); | 570 | s->block_aligned_filename_size); |
571 | rc = -ENOMEM; | 571 | rc = -ENOMEM; |
572 | goto out_unlock; | 572 | goto out_unlock; |
@@ -721,7 +721,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes, | |||
721 | printk(KERN_ERR "%s: Error setting key for crypto context; " | 721 | printk(KERN_ERR "%s: Error setting key for crypto context; " |
722 | "rc = [%d]. s->auth_tok->token.password.session_key_" | 722 | "rc = [%d]. s->auth_tok->token.password.session_key_" |
723 | "encryption_key = [0x%p]; mount_crypt_stat->" | 723 | "encryption_key = [0x%p]; mount_crypt_stat->" |
724 | "global_default_fn_cipher_key_bytes = [%Zd]\n", __func__, | 724 | "global_default_fn_cipher_key_bytes = [%zd]\n", __func__, |
725 | rc, | 725 | rc, |
726 | s->auth_tok->token.password.session_key_encryption_key, | 726 | s->auth_tok->token.password.session_key_encryption_key, |
727 | mount_crypt_stat->global_default_fn_cipher_key_bytes); | 727 | mount_crypt_stat->global_default_fn_cipher_key_bytes); |
@@ -792,7 +792,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size, | |||
792 | } | 792 | } |
793 | s->desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP; | 793 | s->desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP; |
794 | if (max_packet_size < (1 + 1 + ECRYPTFS_SIG_SIZE + 1 + 1)) { | 794 | if (max_packet_size < (1 + 1 + ECRYPTFS_SIG_SIZE + 1 + 1)) { |
795 | printk(KERN_WARNING "%s: max_packet_size is [%Zd]; it must be " | 795 | printk(KERN_WARNING "%s: max_packet_size is [%zd]; it must be " |
796 | "at least [%d]\n", __func__, max_packet_size, | 796 | "at least [%d]\n", __func__, max_packet_size, |
797 | (1 + 1 + ECRYPTFS_SIG_SIZE + 1 + 1)); | 797 | (1 + 1 + ECRYPTFS_SIG_SIZE + 1 + 1)); |
798 | rc = -EINVAL; | 798 | rc = -EINVAL; |
@@ -909,7 +909,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size, | |||
909 | printk(KERN_ERR "%s: Error setting key for crypto context; " | 909 | printk(KERN_ERR "%s: Error setting key for crypto context; " |
910 | "rc = [%d]. s->auth_tok->token.password.session_key_" | 910 | "rc = [%d]. s->auth_tok->token.password.session_key_" |
911 | "encryption_key = [0x%p]; mount_crypt_stat->" | 911 | "encryption_key = [0x%p]; mount_crypt_stat->" |
912 | "global_default_fn_cipher_key_bytes = [%Zd]\n", __func__, | 912 | "global_default_fn_cipher_key_bytes = [%zd]\n", __func__, |
913 | rc, | 913 | rc, |
914 | s->auth_tok->token.password.session_key_encryption_key, | 914 | s->auth_tok->token.password.session_key_encryption_key, |
915 | mount_crypt_stat->global_default_fn_cipher_key_bytes); | 915 | mount_crypt_stat->global_default_fn_cipher_key_bytes); |
@@ -936,7 +936,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size, | |||
936 | s->i++; | 936 | s->i++; |
937 | (*filename_size) = (s->block_aligned_filename_size - s->i); | 937 | (*filename_size) = (s->block_aligned_filename_size - s->i); |
938 | if (!((*filename_size) > 0 && (*filename_size < PATH_MAX))) { | 938 | if (!((*filename_size) > 0 && (*filename_size < PATH_MAX))) { |
939 | printk(KERN_WARNING "%s: Filename size is [%Zd], which is " | 939 | printk(KERN_WARNING "%s: Filename size is [%zd], which is " |
940 | "invalid\n", __func__, (*filename_size)); | 940 | "invalid\n", __func__, (*filename_size)); |
941 | rc = -EINVAL; | 941 | rc = -EINVAL; |
942 | goto out_free_unlock; | 942 | goto out_free_unlock; |