lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ecryptfs: Fix ecryptfs_printk() size_t warnings

Browse Source 
Commit cb55d21f6fa19d8c6c2680d90317ce88c1f57269 revealed a number of
missing 'z' length modifiers in calls to ecryptfs_printk() when
printing variables of type size_t. This patch fixes those compiler
warnings.

Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
This commit is contained in:
Tyler Hicks
2010-11-15 17:36:38 -06:00
parent 888d57bbc9
commit f24b38874e
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ecryptfs/crypto.c
View File

@@ -348,7 +348,7 @@ static int encrypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat,
BUG_ON(!crypt_stat || !crypt_stat->tfm BUG_ON(!crypt_stat || !crypt_stat->tfm
|| !(crypt_stat->flags & ECRYPTFS_STRUCT_INITIALIZED)); || !(crypt_stat->flags & ECRYPTFS_STRUCT_INITIALIZED));
if (unlikely(ecryptfs_verbosity > 0)) { if (unlikely(ecryptfs_verbosity > 0)) {
ecryptfs_printk(KERN_DEBUG, "Key size [%d]; key:\n", ecryptfs_printk(KERN_DEBUG, "Key size [%zd]; key:\n",
crypt_stat->key_size); crypt_stat->key_size);
ecryptfs_dump_hex(crypt_stat->key, ecryptfs_dump_hex(crypt_stat->key,
crypt_stat->key_size); crypt_stat->key_size);
@@ -778,7 +778,7 @@ int ecryptfs_init_crypt_ctx(struct ecryptfs_crypt_stat *crypt_stat)
} }
ecryptfs_printk(KERN_DEBUG, ecryptfs_printk(KERN_DEBUG,
"Initializing cipher [%s]; strlen = [%d]; " "Initializing cipher [%s]; strlen = [%d]; "
"key_size_bits = [%d]\n", "key_size_bits = [%zd]\n",
crypt_stat->cipher, (int)strlen(crypt_stat->cipher), crypt_stat->cipher, (int)strlen(crypt_stat->cipher),
crypt_stat->key_size << 3); crypt_stat->key_size << 3);
if (crypt_stat->tfm) { if (crypt_stat->tfm) {

20
fs/ecryptfs/keystore.c
View File

@@ -130,7 +130,7 @@ int ecryptfs_write_packet_length(char *dest, size_t size,
} else { } else {
rc = -EINVAL; rc = -EINVAL;
ecryptfs_printk(KERN_WARNING, ecryptfs_printk(KERN_WARNING,
"Unsupported packet size: [%d]\n", size); "Unsupported packet size: [%zd]\n", size);
} }
return rc; return rc;
} }
@@ -1672,7 +1672,7 @@ decrypt_passphrase_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok,
auth_tok->session_key.decrypted_key_size); auth_tok->session_key.decrypted_key_size);
crypt_stat->flags |= ECRYPTFS_KEY_VALID; crypt_stat->flags |= ECRYPTFS_KEY_VALID;
if (unlikely(ecryptfs_verbosity > 0)) { if (unlikely(ecryptfs_verbosity > 0)) {
ecryptfs_printk(KERN_DEBUG, "FEK of size [%d]:\n", ecryptfs_printk(KERN_DEBUG, "FEK of size [%zd]:\n",
crypt_stat->key_size); crypt_stat->key_size);
ecryptfs_dump_hex(crypt_stat->key, ecryptfs_dump_hex(crypt_stat->key,
crypt_stat->key_size); crypt_stat->key_size);
@@ -1754,7 +1754,7 @@ int ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat,
if (ECRYPTFS_SIG_SIZE != tag_11_contents_size) { if (ECRYPTFS_SIG_SIZE != tag_11_contents_size) {
ecryptfs_printk(KERN_ERR, "Expected " ecryptfs_printk(KERN_ERR, "Expected "
"signature of size [%d]; " "signature of size [%d]; "
"read size [%d]\n", "read size [%zd]\n",
ECRYPTFS_SIG_SIZE, ECRYPTFS_SIG_SIZE,
tag_11_contents_size); tag_11_contents_size);
rc = -EIO; rc = -EIO;
@@ -1787,8 +1787,8 @@ int ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat,
goto out_wipe_list; goto out_wipe_list;
break; break;
default: default:
ecryptfs_printk(KERN_DEBUG, "No packet at offset " ecryptfs_printk(KERN_DEBUG, "No packet at offset [%zd] "
"[%d] of the file header; hex value of " "of the file header; hex value of "
"character is [0x%.2x]\n", i, src[i]); "character is [0x%.2x]\n", i, src[i]);
next_packet_is_auth_tok_packet = 0; next_packet_is_auth_tok_packet = 0;
} }
@@ -2168,7 +2168,7 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes,
if (encrypted_session_key_valid) { if (encrypted_session_key_valid) {
ecryptfs_printk(KERN_DEBUG, "encrypted_session_key_valid != 0; " ecryptfs_printk(KERN_DEBUG, "encrypted_session_key_valid != 0; "
"using auth_tok->session_key.encrypted_key, " "using auth_tok->session_key.encrypted_key, "
"where key_rec->enc_key_size = [%d]\n", "where key_rec->enc_key_size = [%zd]\n",
key_rec->enc_key_size); key_rec->enc_key_size);
memcpy(key_rec->enc_key, memcpy(key_rec->enc_key,
auth_tok->session_key.encrypted_key, auth_tok->session_key.encrypted_key,
@@ -2198,7 +2198,7 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes,
if (rc < 1 || rc > 2) { if (rc < 1 || rc > 2) {
ecryptfs_printk(KERN_ERR, "Error generating scatterlist " ecryptfs_printk(KERN_ERR, "Error generating scatterlist "
"for crypt_stat session key; expected rc = 1; " "for crypt_stat session key; expected rc = 1; "
"got rc = [%d]. key_rec->enc_key_size = [%d]\n", "got rc = [%d]. key_rec->enc_key_size = [%zd]\n",
rc, key_rec->enc_key_size); rc, key_rec->enc_key_size);
rc = -ENOMEM; rc = -ENOMEM;
goto out; goto out;
@@ -2209,7 +2209,7 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes,
ecryptfs_printk(KERN_ERR, "Error generating scatterlist " ecryptfs_printk(KERN_ERR, "Error generating scatterlist "
"for crypt_stat encrypted session key; " "for crypt_stat encrypted session key; "
"expected rc = 1; got rc = [%d]. " "expected rc = 1; got rc = [%d]. "
"key_rec->enc_key_size = [%d]\n", rc, "key_rec->enc_key_size = [%zd]\n", rc,
key_rec->enc_key_size); key_rec->enc_key_size);
rc = -ENOMEM; rc = -ENOMEM;
goto out; goto out;
@@ -2224,7 +2224,7 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes,
goto out; goto out;
} }
rc = 0; rc = 0;
ecryptfs_printk(KERN_DEBUG, "Encrypting [%d] bytes of the key\n", ecryptfs_printk(KERN_DEBUG, "Encrypting [%zd] bytes of the key\n",
crypt_stat->key_size); crypt_stat->key_size);
rc = crypto_blkcipher_encrypt(&desc, dst_sg, src_sg, rc = crypto_blkcipher_encrypt(&desc, dst_sg, src_sg,
(*key_rec).enc_key_size); (*key_rec).enc_key_size);
@@ -2235,7 +2235,7 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes,
} }
ecryptfs_printk(KERN_DEBUG, "This should be the encrypted key:\n"); ecryptfs_printk(KERN_DEBUG, "This should be the encrypted key:\n");
if (ecryptfs_verbosity > 0) { if (ecryptfs_verbosity > 0) {
ecryptfs_printk(KERN_DEBUG, "EFEK of size [%d]:\n", ecryptfs_printk(KERN_DEBUG, "EFEK of size [%zd]:\n",
key_rec->enc_key_size); key_rec->enc_key_size);
ecryptfs_dump_hex(key_rec->enc_key, ecryptfs_dump_hex(key_rec->enc_key,
key_rec->enc_key_size); key_rec->enc_key_size);