---

yaml --- r: 124988 b: refs/heads/master c: ebd09ab h: refs/heads/master v: v3
git-mirror · Dec 31, 2008 · a168215 · a168215
1 parent f89ea5c
commit a168215
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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)