hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Halcrow 2009-01-06 14:42:03 -08:00 committed by Linus Torvalds
parent df261c52ab
commit a8f12864c5
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ecryptfs/crypto.c
View File

@ -2093,7 +2093,7 @@ int ecryptfs_encrypt_and_encode_filename(
filename = kzalloc(sizeof(*filename), GFP_KERNEL); filename = kzalloc(sizeof(*filename), GFP_KERNEL);
if (!filename) { if (!filename) {
printk(KERN_ERR "%s: Out of memory whilst attempting " printk(KERN_ERR "%s: Out of memory whilst attempting "
"to kzalloc [%d] bytes\n", __func__, "to kzalloc [%zd] bytes\n", __func__,
sizeof(*filename)); sizeof(*filename));
rc = -ENOMEM; rc = -ENOMEM;
goto out; goto out;
@ -2127,7 +2127,7 @@ int ecryptfs_encrypt_and_encode_filename(
(*encoded_name) = kmalloc((*encoded_name_size) + 1, GFP_KERNEL); (*encoded_name) = kmalloc((*encoded_name_size) + 1, GFP_KERNEL);
if (!(*encoded_name)) { if (!(*encoded_name)) {
printk(KERN_ERR "%s: Out of memory whilst attempting " printk(KERN_ERR "%s: Out of memory whilst attempting "
"to kzalloc [%d] bytes\n", __func__, "to kzalloc [%zd] bytes\n", __func__,
(*encoded_name_size)); (*encoded_name_size));
rc = -ENOMEM; rc = -ENOMEM;
kfree(filename->encrypted_filename); kfree(filename->encrypted_filename);

2
fs/ecryptfs/file.c
View File

@ -82,7 +82,7 @@ ecryptfs_filldir(void *dirent, const char *lower_name, int lower_namelen,
{ {
struct ecryptfs_getdents_callback *buf = struct ecryptfs_getdents_callback *buf =
(struct ecryptfs_getdents_callback *)dirent; (struct ecryptfs_getdents_callback *)dirent;
int name_size; size_t name_size;
char *name; char *name;
int rc; int rc;

2
fs/ecryptfs/inode.c
View File

@ -362,7 +362,7 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode,
struct nameidata *ecryptfs_nd) struct nameidata *ecryptfs_nd)
{ {
char *encrypted_and_encoded_name = NULL; char *encrypted_and_encoded_name = NULL;
int encrypted_and_encoded_name_size; size_t encrypted_and_encoded_name_size;
struct ecryptfs_crypt_stat *crypt_stat = NULL; struct ecryptfs_crypt_stat *crypt_stat = NULL;
struct ecryptfs_mount_crypt_stat *mount_crypt_stat = NULL; struct ecryptfs_mount_crypt_stat *mount_crypt_stat = NULL;
struct ecryptfs_inode_info *inode_info; struct ecryptfs_inode_info *inode_info;

24
fs/ecryptfs/keystore.c
View File

@ -556,8 +556,8 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,
goto out_unlock; goto out_unlock;
} }
if (s->max_packet_size > (*remaining_bytes)) { if (s->max_packet_size > (*remaining_bytes)) {
printk(KERN_WARNING "%s: Require [%d] bytes to write; only " printk(KERN_WARNING "%s: Require [%zd] bytes to write; only "
"[%d] available\n", __func__, s->max_packet_size, "[%zd] available\n", __func__, s->max_packet_size,
(*remaining_bytes)); (*remaining_bytes));
rc = -EINVAL; rc = -EINVAL;
goto out_unlock; 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); mount_crypt_stat->global_default_fn_cipher_key_bytes);
if (s->cipher_code == 0) { if (s->cipher_code == 0) {
printk(KERN_WARNING "%s: Unable to generate code for " 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_name,
mount_crypt_stat->global_default_fn_cipher_key_bytes); mount_crypt_stat->global_default_fn_cipher_key_bytes);
rc = -EINVAL; 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 " printk(KERN_ERR "%s: Internal error whilst attempting to "
"convert filename memory to scatterlist; " "convert filename memory to scatterlist; "
"expected rc = 1; got rc = [%d]. " "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); s->block_aligned_filename_size);
goto out_release_free_unlock; 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 " printk(KERN_ERR "%s: Internal error whilst attempting to "
"convert encrypted filename memory to scatterlist; " "convert encrypted filename memory to scatterlist; "
"expected rc = 1; got rc = [%d]. " "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); s->block_aligned_filename_size);
goto out_release_free_unlock; goto out_release_free_unlock;
} }
@ -787,7 +787,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
s = kmalloc(sizeof(*s), GFP_KERNEL); s = kmalloc(sizeof(*s), GFP_KERNEL);
if (!s) { if (!s) {
printk(KERN_ERR "%s: Out of memory whilst trying to kmalloc " 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; goto out;
} }
s->desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP; s->desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;
@ -825,8 +825,8 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
- ECRYPTFS_SIG_SIZE - 1); - ECRYPTFS_SIG_SIZE - 1);
if ((1 + s->packet_size_len + s->parsed_tag_70_packet_size) if ((1 + s->packet_size_len + s->parsed_tag_70_packet_size)
> max_packet_size) { > max_packet_size) {
printk(KERN_WARNING "%s: max_packet_size is [%d]; real packet " printk(KERN_WARNING "%s: max_packet_size is [%zd]; real packet "
"size is [%d]\n", __func__, max_packet_size, "size is [%zd]\n", __func__, max_packet_size,
(1 + s->packet_size_len + 1 (1 + s->packet_size_len + 1
+ s->block_aligned_filename_size)); + s->block_aligned_filename_size));
rc = -EINVAL; rc = -EINVAL;
@ -860,7 +860,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
printk(KERN_ERR "%s: Internal error whilst attempting to " printk(KERN_ERR "%s: Internal error whilst attempting to "
"convert encrypted filename memory to scatterlist; " "convert encrypted filename memory to scatterlist; "
"expected rc = 1; got rc = [%d]. " "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); s->block_aligned_filename_size);
goto out_unlock; goto out_unlock;
} }
@ -869,7 +869,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
GFP_KERNEL); GFP_KERNEL);
if (!s->decrypted_filename) { if (!s->decrypted_filename) {
printk(KERN_ERR "%s: Out of memory whilst attempting to " 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); s->block_aligned_filename_size);
rc = -ENOMEM; rc = -ENOMEM;
goto out_unlock; goto out_unlock;
@ -880,7 +880,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
printk(KERN_ERR "%s: Internal error whilst attempting to " printk(KERN_ERR "%s: Internal error whilst attempting to "
"convert decrypted filename memory to scatterlist; " "convert decrypted filename memory to scatterlist; "
"expected rc = 1; got rc = [%d]. " "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); s->block_aligned_filename_size);
goto out_free_unlock; goto out_free_unlock;
} }
@ -944,7 +944,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
(*filename) = kmalloc(((*filename_size) + 1), GFP_KERNEL); (*filename) = kmalloc(((*filename_size) + 1), GFP_KERNEL);
if (!(*filename)) { if (!(*filename)) {
printk(KERN_ERR "%s: Out of memory whilst attempting to " printk(KERN_ERR "%s: Out of memory whilst attempting to "
"kmalloc [%d] bytes\n", __func__, "kmalloc [%zd] bytes\n", __func__,
((*filename_size) + 1)); ((*filename_size) + 1));
rc = -ENOMEM; rc = -ENOMEM;
goto out_free_unlock; goto out_free_unlock;