git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.30' into for-2.6.31
[safe/jmp/linux-2.6]
/
fs
/
ecryptfs
/
inode.c
diff --git
a/fs/ecryptfs/inode.c
b/fs/ecryptfs/inode.c
index
93bc0f8
..
2f0945d
100644
(file)
--- a/
fs/ecryptfs/inode.c
+++ b/
fs/ecryptfs/inode.c
@@
-667,7
+667,7
@@
ecryptfs_readlink(struct dentry *dentry, char __user *buf, int bufsiz)
lower_buf = kmalloc(lower_bufsiz, GFP_KERNEL);
if (lower_buf == NULL) {
printk(KERN_ERR "%s: Out of memory whilst attempting to "
lower_buf = kmalloc(lower_bufsiz, GFP_KERNEL);
if (lower_buf == NULL) {
printk(KERN_ERR "%s: Out of memory whilst attempting to "
- "kmalloc [%d] bytes\n", __func__, lower_bufsiz);
+ "kmalloc [%
z
d] bytes\n", __func__, lower_bufsiz);
rc = -ENOMEM;
goto out;
}
rc = -ENOMEM;
goto out;
}
@@
-690,7
+690,7
@@
ecryptfs_readlink(struct dentry *dentry, char __user *buf, int bufsiz)
}
/* Check for bufsiz <= 0 done in sys_readlinkat() */
rc = copy_to_user(buf, plaintext_name,
}
/* Check for bufsiz <= 0 done in sys_readlinkat() */
rc = copy_to_user(buf, plaintext_name,
- min((
unsigned
) bufsiz, plaintext_name_size));
+ min((
size_t
) bufsiz, plaintext_name_size));
if (rc)
rc = -EFAULT;
else
if (rc)
rc = -EFAULT;
else