ecryptfs: Fix ecryptfs_printk() size_t warnings

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>

+12 -12
+2 -2
fs/ecryptfs/crypto.c
··· 348 348 BUG_ON(!crypt_stat || !crypt_stat->tfm 349 349 || !(crypt_stat->flags & ECRYPTFS_STRUCT_INITIALIZED)); 350 350 if (unlikely(ecryptfs_verbosity > 0)) { 351 - ecryptfs_printk(KERN_DEBUG, "Key size [%d]; key:\n", 351 + ecryptfs_printk(KERN_DEBUG, "Key size [%zd]; key:\n", 352 352 crypt_stat->key_size); 353 353 ecryptfs_dump_hex(crypt_stat->key, 354 354 crypt_stat->key_size); ··· 778 778 } 779 779 ecryptfs_printk(KERN_DEBUG, 780 780 "Initializing cipher [%s]; strlen = [%d]; " 781 - "key_size_bits = [%d]\n", 781 + "key_size_bits = [%zd]\n", 782 782 crypt_stat->cipher, (int)strlen(crypt_stat->cipher), 783 783 crypt_stat->key_size << 3); 784 784 if (crypt_stat->tfm) {
+10 -10
fs/ecryptfs/keystore.c
··· 130 130 } else { 131 131 rc = -EINVAL; 132 132 ecryptfs_printk(KERN_WARNING, 133 - "Unsupported packet size: [%d]\n", size); 133 + "Unsupported packet size: [%zd]\n", size); 134 134 } 135 135 return rc; 136 136 } ··· 1672 1672 auth_tok->session_key.decrypted_key_size); 1673 1673 crypt_stat->flags |= ECRYPTFS_KEY_VALID; 1674 1674 if (unlikely(ecryptfs_verbosity > 0)) { 1675 - ecryptfs_printk(KERN_DEBUG, "FEK of size [%d]:\n", 1675 + ecryptfs_printk(KERN_DEBUG, "FEK of size [%zd]:\n", 1676 1676 crypt_stat->key_size); 1677 1677 ecryptfs_dump_hex(crypt_stat->key, 1678 1678 crypt_stat->key_size); ··· 1754 1754 if (ECRYPTFS_SIG_SIZE != tag_11_contents_size) { 1755 1755 ecryptfs_printk(KERN_ERR, "Expected " 1756 1756 "signature of size [%d]; " 1757 - "read size [%d]\n", 1757 + "read size [%zd]\n", 1758 1758 ECRYPTFS_SIG_SIZE, 1759 1759 tag_11_contents_size); 1760 1760 rc = -EIO; ··· 1787 1787 goto out_wipe_list; 1788 1788 break; 1789 1789 default: 1790 - ecryptfs_printk(KERN_DEBUG, "No packet at offset " 1791 - "[%d] of the file header; hex value of " 1790 + ecryptfs_printk(KERN_DEBUG, "No packet at offset [%zd] " 1791 + "of the file header; hex value of " 1792 1792 "character is [0x%.2x]\n", i, src[i]); 1793 1793 next_packet_is_auth_tok_packet = 0; 1794 1794 } ··· 2168 2168 if (encrypted_session_key_valid) { 2169 2169 ecryptfs_printk(KERN_DEBUG, "encrypted_session_key_valid != 0; " 2170 2170 "using auth_tok->session_key.encrypted_key, " 2171 - "where key_rec->enc_key_size = [%d]\n", 2171 + "where key_rec->enc_key_size = [%zd]\n", 2172 2172 key_rec->enc_key_size); 2173 2173 memcpy(key_rec->enc_key, 2174 2174 auth_tok->session_key.encrypted_key, ··· 2198 2198 if (rc < 1 || rc > 2) { 2199 2199 ecryptfs_printk(KERN_ERR, "Error generating scatterlist " 2200 2200 "for crypt_stat session key; expected rc = 1; " 2201 - "got rc = [%d]. key_rec->enc_key_size = [%d]\n", 2201 + "got rc = [%d]. key_rec->enc_key_size = [%zd]\n", 2202 2202 rc, key_rec->enc_key_size); 2203 2203 rc = -ENOMEM; 2204 2204 goto out; ··· 2209 2209 ecryptfs_printk(KERN_ERR, "Error generating scatterlist " 2210 2210 "for crypt_stat encrypted session key; " 2211 2211 "expected rc = 1; got rc = [%d]. " 2212 - "key_rec->enc_key_size = [%d]\n", rc, 2212 + "key_rec->enc_key_size = [%zd]\n", rc, 2213 2213 key_rec->enc_key_size); 2214 2214 rc = -ENOMEM; 2215 2215 goto out; ··· 2224 2224 goto out; 2225 2225 } 2226 2226 rc = 0; 2227 - ecryptfs_printk(KERN_DEBUG, "Encrypting [%d] bytes of the key\n", 2227 + ecryptfs_printk(KERN_DEBUG, "Encrypting [%zd] bytes of the key\n", 2228 2228 crypt_stat->key_size); 2229 2229 rc = crypto_blkcipher_encrypt(&desc, dst_sg, src_sg, 2230 2230 (*key_rec).enc_key_size); ··· 2235 2235 } 2236 2236 ecryptfs_printk(KERN_DEBUG, "This should be the encrypted key:\n"); 2237 2237 if (ecryptfs_verbosity > 0) { 2238 - ecryptfs_printk(KERN_DEBUG, "EFEK of size [%d]:\n", 2238 + ecryptfs_printk(KERN_DEBUG, "EFEK of size [%zd]:\n", 2239 2239 key_rec->enc_key_size); 2240 2240 ecryptfs_dump_hex(key_rec->enc_key, 2241 2241 key_rec->enc_key_size);