From: "Duane Griffin" <duaneg@dghda.com>
To: linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, Al Viro <viro@zeniv.linux.org.uk>,
Andrew Morton <akpm@linux-foundation.org>,
Duane Griffin <duaneg@dghda.com>
Subject: [PATCH, v5] vfs: ensure page symlinks are NUL-terminated
Date: Fri, 19 Dec 2008 20:47:12 +0000 [thread overview]
Message-ID: <1229719638-6982-5-git-send-email-duaneg@dghda.com> (raw)
In-Reply-To: <1229719638-6982-4-git-send-email-duaneg@dghda.com>
On-disk data corruption could cause a page link to have its i_size set
to PAGE_SIZE (or a multiple thereof) and its contents all non-NUL.
NUL-terminate the link name to ensure this doesn't cause further
problems for the kernel.
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Duane Griffin <duaneg@dghda.com>
---
Unchanged from v4.
fs/namei.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index af3783f..2416922 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2750,13 +2750,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)
--
1.6.0.4
next prev parent reply other threads:[~2008-12-19 20:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-19 20:47 [PATCH 0/10] make link target handling more robust Duane Griffin
2008-12-19 20:47 ` [PATCH, v5] 9p: don't print IS_ERR strings Duane Griffin
2008-12-19 20:47 ` [PATCH, v5] eCryptfs: check readlink result was not an error before using it Duane Griffin
2008-12-19 20:47 ` [PATCH, v5] vfs: introduce helper function to safely NUL-terminate symlinks Duane Griffin
2008-12-19 20:47 ` Duane Griffin [this message]
2008-12-19 20:47 ` [PATCH, v5] ext2: ensure fast symlinks are NUL-terminated Duane Griffin
2008-12-19 20:47 ` [PATCH, v5] ext3: " Duane Griffin
2008-12-19 20:47 ` [PATCH, v5] ext4: " Duane Griffin
2008-12-19 20:47 ` [PATCH, v5] sysv: " Duane Griffin
2008-12-19 20:47 ` [PATCH, v5] freevxfs: " Duane Griffin
2008-12-19 20:47 ` [PATCH, v5] befs: " Duane Griffin
2008-12-22 19:58 ` [PATCH, v5] eCryptfs: check readlink result was not an error before using it Tyler Hicks
2008-12-22 20:06 ` Dustin Kirkland
2008-12-19 22:07 ` [PATCH, v5] 9p: don't print IS_ERR strings Eric Van Hensbergen
2008-12-19 22:22 ` Duane Griffin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1229719638-6982-5-git-send-email-duaneg@dghda.com \
--to=duaneg@dghda.com \
--cc=akpm@linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).