From: Eric Sandeen <sandeen@redhat.com>
To: linux-xfs <linux-xfs@vger.kernel.org>
Cc: Zorro Lang <zlang@redhat.com>
Subject: [PATCH] mkfs.xfs: null-terminate symlinks created via protofile
Date: Mon, 26 Nov 2018 16:39:30 -0600 [thread overview]
Message-ID: <a7246562-e851-dfc4-ea3f-3b4dd64aca5b@redhat.com> (raw)
Now that we have a symlink verifier which checks that in-memory
symlink names are null-terminated, be sure we do that when we
create them via the mkfs protofile.
We only want to null-terminate inline data if it's a symlink;
we only ever /call/ newfile() with "dolocal" for symlinks, so
rename that function argument for clarity.
Zorro found this by running xfs/019 on an s390x machine, it
failed with:
Metadata corruption detected at 0x101214a, inode 0x89 data fork
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reported-by: Zorro Lang <zlang@redhat.com>
---
diff --git a/mkfs/proto.c b/mkfs/proto.c
index 1cd5436..d76c80d 100644
--- a/mkfs/proto.c
+++ b/mkfs/proto.c
@@ -15,7 +15,7 @@ static char *getstr(char **pp);
static void fail(char *msg, int i);
static struct xfs_trans * getres(struct xfs_mount *mp, uint blocks);
static void rsvfile(xfs_mount_t *mp, xfs_inode_t *ip, long long len);
-static int newfile(xfs_trans_t *tp, xfs_inode_t *ip, int dolocal, int logit,
+static int newfile(xfs_trans_t *tp, xfs_inode_t *ip, int symlink, int logit,
char *buf, int len);
static char *newregfile(char **pp, int *len);
static void rtinit(xfs_mount_t *mp);
@@ -220,7 +220,7 @@ static int
newfile(
xfs_trans_t *tp,
xfs_inode_t *ip,
- int dolocal,
+ int symlink,
int logit,
char *buf,
int len)
@@ -236,7 +236,9 @@ newfile(
flags = 0;
mp = ip->i_mount;
- if (dolocal && len <= XFS_IFORK_DSIZE(ip)) {
+ if (symlink && len <= XFS_IFORK_DSIZE(ip)) {
+ /* Copy the name's trailing NULL as well */
+ len += 1;
libxfs_idata_realloc(ip, len, XFS_DATA_FORK);
if (buf)
memmove(ip->i_df.if_u1.if_data, buf, len);
next reply other threads:[~2018-11-27 9:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-26 22:39 Eric Sandeen [this message]
2018-11-26 22:55 ` [PATCH] mkfs.xfs: null-terminate symlinks created via protofile Darrick J. Wong
2018-11-26 23:01 ` Eric Sandeen
2018-11-26 23:04 ` [PATCH V2] " Eric Sandeen
2018-11-27 16:18 ` Darrick J. Wong
2018-12-11 19:02 ` [PATCH] mkfs: fix symlink target if_bytes computation for protofile Darrick J. Wong
2018-12-11 20:36 ` Eric Sandeen
2018-12-11 22:42 ` Darrick J. Wong
2018-12-12 4:50 ` Darrick J. Wong
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=a7246562-e851-dfc4-ea3f-3b4dd64aca5b@redhat.com \
--to=sandeen@redhat.com \
--cc=linux-xfs@vger.kernel.org \
--cc=zlang@redhat.com \
/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