From a16821509bbd8fcdaea3d60b8ea1edc81efb75e0 Mon Sep 17 00:00:00 2001 From: Duane Griffin Date: Fri, 19 Dec 2008 20:47:12 +0000 Subject: [PATCH] --- yaml --- r: 124988 b: refs/heads/master c: ebd09abbd9699f328165aee50a070403fbf55a37 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/namei.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e87e7bb2cc5f..519379e4421d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 035146851cfa2fe24c1d9dc7637bb009ad06b2f7 +refs/heads/master: ebd09abbd9699f328165aee50a070403fbf55a37 diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index ab441af4196b..9ed5e2818f80 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -2786,13 +2786,16 @@ int vfs_follow_link(struct nameidata *nd, const char *link) /* get the link contents into pagecache */ static char *page_getlink(struct dentry * dentry, struct page **ppage) { - struct page * page; + char *kaddr; + struct page *page; struct address_space *mapping = dentry->d_inode->i_mapping; page = read_mapping_page(mapping, 0, NULL); if (IS_ERR(page)) return (char*)page; *ppage = page; - return kmap(page); + kaddr = kmap(page); + nd_terminate_link(kaddr, dentry->d_inode->i_size, PAGE_SIZE - 1); + return kaddr; } int page_readlink(struct dentry *dentry, char __user *buffer, int buflen)