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@xxxxxxxxxx>
Reported-by: Zorro Lang <zlang@xxxxxxxxxx>
---
V2: don't increase len, it gets set into i_size. Just bump
the allocation/copy by 1. Thanks, Darrick.
diff --git a/mkfs/proto.c b/mkfs/proto.c
index 1cd5436..103795f 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,10 +236,11 @@ newfile(
flags = 0;
mp = ip->i_mount;
- if (dolocal && len <= XFS_IFORK_DSIZE(ip)) {
- libxfs_idata_realloc(ip, len, XFS_DATA_FORK);
+ if (symlink && len <= XFS_IFORK_DSIZE(ip)) {
+ /* Copy the name's trailing NULL as well */
+ libxfs_idata_realloc(ip, len + 1, XFS_DATA_FORK);
if (buf)
- memmove(ip->i_df.if_u1.if_data, buf, len);
+ memmove(ip->i_df.if_u1.if_data, buf, len + 1);
ip->i_d.di_size = len;
ip->i_df.if_flags &= ~XFS_IFEXTENTS;
ip->i_df.if_flags |= XFS_IFINLINE;
