From: "Duane Griffin" <duaneg@dghda.com>
To: Evgeniy Dushistov <dushistov@mail.ru>
Cc: linux-kernel@vger.kernel.org, Duane Griffin <duaneg@dghda.com>
Subject: [PATCH 3/4] ufs: ensure fast symlinks are NUL-terminated
Date: Wed, 31 Dec 2008 16:50:07 +0000 [thread overview]
Message-ID: <1230742208-23972-3-git-send-email-duaneg@dghda.com> (raw)
In-Reply-To: <1230742208-23972-2-git-send-email-duaneg@dghda.com>
Ensure fast symlink targets are NUL-terminated, even if corrupted
on-disk.
Signed-off-by: Duane Griffin <duaneg@dghda.com>
---
fs/ufs/inode.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index c1ea916..c2edfb6 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -658,8 +658,9 @@ static int ufs1_read_inode(struct inode *inode, struct ufs_inode *ufs_inode)
for (i = 0; i < (UFS_NDADDR + UFS_NINDIR); i++)
ufsi->i_u1.i_data[i] = ufs_inode->ui_u2.ui_addr.ui_db[i];
} else {
- for (i = 0; i < (UFS_NDADDR + UFS_NINDIR) * 4; i++)
+ for (i = 0; i < (UFS_NDADDR + UFS_NINDIR) * 4 - 1; i++)
ufsi->i_u1.i_symlink[i] = ufs_inode->ui_u2.ui_symlink[i];
+ ufsi->i_u1.i_symlink[(UFS_NDADDR + UFS_NINDIR) * 4 - 1] = 0;
}
return 0;
}
@@ -708,8 +709,9 @@ static int ufs2_read_inode(struct inode *inode, struct ufs2_inode *ufs2_inode)
ufsi->i_u1.u2_i_data[i] =
ufs2_inode->ui_u2.ui_addr.ui_db[i];
} else {
- for (i = 0; i < (UFS_NDADDR + UFS_NINDIR) * 4 * 2; i++)
+ for (i = 0; i < (UFS_NDADDR + UFS_NINDIR) * 4 * 2 - 1; i++)
ufsi->i_u1.i_symlink[i] = ufs2_inode->ui_u2.ui_symlink[i];
+ ufsi->i_u1.i_symlink[(UFS_NDADDR + UFS_NINDIR) * 4 * 2 - 1] = 0;
}
return 0;
}
--
1.6.0.6
next prev parent reply other threads:[~2008-12-31 16:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-31 16:50 [PATCH 1/4] ufs: validate maximum fast symlink size from superblock Duane Griffin
2008-12-31 16:50 ` [PATCH 2/4] ufs: don't truncate longer ufs2 fast symlinks Duane Griffin
2008-12-31 16:50 ` Duane Griffin [this message]
2008-12-31 16:50 ` [PATCH 4/4] ufs: copy symlink data into the correct union member Duane Griffin
2009-01-01 2:36 ` Al Viro
2009-01-02 14:17 ` Duane Griffin
2009-01-01 2:32 ` [PATCH 2/4] ufs: don't truncate longer ufs2 fast symlinks Al Viro
2009-01-02 14:09 ` Duane Griffin
2009-01-04 19:15 ` [PATCH 1/4] ufs: validate maximum fast symlink size from superblock Evgeniy Dushistov
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=1230742208-23972-3-git-send-email-duaneg@dghda.com \
--to=duaneg@dghda.com \
--cc=dushistov@mail.ru \
--cc=linux-kernel@vger.kernel.org \
/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
all inboxes | Powered by JetHome®