lkml.org 
[lkml]   [2010]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
SubjectRe: [PATCH] ecryptfs: Fix refcnt leak on ecryptfs_follow_link() error path
Date
Al Viro <viro@ZenIV.linux.org.uk> writes:

> On Tue, Jan 12, 2010 at 03:36:14AM +0900, OGAWA Hirofumi wrote:
>>
>> If ->follow_link handler return the error, it should decrement
>> nd->path refcnt. But, ecryptfs_follow_link() doesn't decrement.
>>
>> This patch fix it by using usual nd_set_link() style error handling,
>> instead of playing with nd->path.
>
> Applied.

Sigh, sorry. I introduced new bug by this patch. Please apply this too.
--
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>


[PATCH] ecryptfs: Fix memory leak of buf in ecryptfs_follow_link()

Fix memory leak of buf in ecryptfs_follow_link() in recent my change.

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
---

fs/ecryptfs/inode.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff -puN fs/ecryptfs/inode.c~namei-ecryptfs-follow_link-fix-fix fs/ecryptfs/inode.c
--- linux-2.6/fs/ecryptfs/inode.c~namei-ecryptfs-follow_link-fix-fix 2010-01-14 05:33:49.000000000 +0900
+++ linux-2.6-hirofumi/fs/ecryptfs/inode.c 2010-01-14 05:34:30.000000000 +0900
@@ -722,9 +722,10 @@ static void *ecryptfs_follow_link(struct
set_fs(get_ds());
rc = dentry->d_inode->i_op->readlink(dentry, (char __user *)buf, len);
set_fs(old_fs);
- if (rc < 0)
+ if (rc < 0) {
+ kfree(buf);
buf = ERR_PTR(rc);
- else
+ } else
buf[rc] = '\0';
out:
nd_set_link(nd, buf);
_

\
 
 \ /
  Last update: 2010-01-14 04:35    [W:0.039 / U:0.668 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site