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 2/4] ufs: don't truncate longer ufs2 fast symlinks
Date: Wed, 31 Dec 2008 16:50:06 +0000 [thread overview]
Message-ID: <1230742208-23972-2-git-send-email-duaneg@dghda.com> (raw)
In-Reply-To: <1230742208-23972-1-git-send-email-duaneg@dghda.com>
ufs2 fast symlinks can be twice as long as ufs ones, however the code
was using the ufs size in various places. Fix that so ufs2 symlinks over
60 characters aren't truncated.
Signed-off-by: Duane Griffin <duaneg@dghda.com>
---
fs/ufs/inode.c | 4 ++--
fs/ufs/ufs.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index 39f8778..c1ea916 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -708,7 +708,7 @@ 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; i++)
+ for (i = 0; i < (UFS_NDADDR + UFS_NINDIR) * 4 * 2; i++)
ufsi->i_u1.i_symlink[i] = ufs2_inode->ui_u2.ui_symlink[i];
}
return 0;
@@ -853,7 +853,7 @@ static void ufs2_update_inode(struct inode *inode, struct ufs2_inode *ufs_inode)
for (i = 0; i < (UFS_NDADDR + UFS_NINDIR); i++)
ufs_inode->ui_u2.ui_addr.ui_db[i] = ufsi->i_u1.u2_i_data[i];
} else {
- for (i = 0; i < (UFS_NDADDR + UFS_NINDIR) * 4; i++)
+ for (i = 0; i < (UFS_NDADDR + UFS_NINDIR) * 4 * 2; i++)
ufs_inode->ui_u2.ui_symlink[i] = ufsi->i_u1.i_symlink[i];
}
diff --git a/fs/ufs/ufs.h b/fs/ufs/ufs.h
index 11c0351..69b3427 100644
--- a/fs/ufs/ufs.h
+++ b/fs/ufs/ufs.h
@@ -23,7 +23,7 @@ struct ufs_sb_info {
struct ufs_inode_info {
union {
__fs32 i_data[15];
- __u8 i_symlink[4*15];
+ __u8 i_symlink[2 * 4 * 15];
__fs64 u2_i_data[15];
} i_u1;
__u32 i_flags;
--
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 ` Duane Griffin [this message]
2008-12-31 16:50 ` [PATCH 3/4] ufs: ensure fast symlinks are NUL-terminated Duane Griffin
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-2-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
Powered by JetHome