evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6

Browse source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
  eCryptfs: Fix min function comparison warning
  ecryptfs: fix printk format warning
This commit is contained in:
Linus Torvalds 2009-04-29 21:25:53 -07:00
commit 9ea66ab580
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/ecryptfs/inode.c
View file

@ -667,7 +667,7 @@ ecryptfs_readlink(struct dentry *dentry, char __user *buf, int bufsiz)
lower_buf = kmalloc(lower_bufsiz, GFP_KERNEL); lower_buf = kmalloc(lower_bufsiz, GFP_KERNEL);
if (lower_buf == NULL) { if (lower_buf == NULL) {
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__, lower_bufsiz); "kmalloc [%zd] bytes\n", __func__, lower_bufsiz);
rc = -ENOMEM; rc = -ENOMEM;
goto out; goto out;
} }
@ -690,7 +690,7 @@ ecryptfs_readlink(struct dentry *dentry, char __user *buf, int bufsiz)
} }
/* Check for bufsiz <= 0 done in sys_readlinkat() */ /* Check for bufsiz <= 0 done in sys_readlinkat() */
rc = copy_to_user(buf, plaintext_name, rc = copy_to_user(buf, plaintext_name,
min((unsigned) bufsiz, plaintext_name_size)); min((size_t) bufsiz, plaintext_name_size));
if (rc) if (rc)
rc = -EFAULT; rc = -EFAULT;
else else