From: Allison Henderson <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v2 21/27] xfsprogs: Remove single byte array from struct parent
Date: Sat, 9 Jun 2018 22:07:46 -0700 [thread overview]
Message-ID: <1528607272-11122-22-git-send-email-allison.henderson@oracle.com> (raw)
In-Reply-To: <1528607272-11122-1-git-send-email-allison.henderson@oracle.com>
Variable sized arrays implemented this way may cause
corruptions depending on how different compilers pack
the structure.
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
---
include/parent.h | 1 -
io/parent.c | 9 ++++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/parent.h b/include/parent.h
index f338f96..85cef85 100644
--- a/include/parent.h
+++ b/include/parent.h
@@ -22,7 +22,6 @@ typedef struct parent {
__u64 p_ino;
__u32 p_gen;
__u16 p_reclen;
- char p_name[1];
} parent_t;
typedef struct parent_cursor {
diff --git a/io/parent.c b/io/parent.c
index 1968516..55b8b49 100644
--- a/io/parent.c
+++ b/io/parent.c
@@ -45,7 +45,8 @@ check_parent_entry(xfs_bstat_t *bstatp, parent_t *parent)
struct stat statbuf;
char *str;
- sprintf(fullpath, _("%s%s"), mntpt, parent->p_name);
+ snprintf(fullpath, parent->p_reclen, _("%s%s"), mntpt,
+ ((char*)parent)+sizeof(struct parent));
sts = lstat(fullpath, &statbuf);
if (sts != 0) {
@@ -284,9 +285,11 @@ print_parent_entry(parent_t *parent, int fullpath)
printf(_("p_gen = %u\n"), parent->p_gen);
printf(_("p_reclen = %u\n"), parent->p_reclen);
if (fullpath)
- printf(_("p_name = \"%s%s\"\n"), mntpt, parent->p_name);
+ printf(_("p_name = \"%s%s\"\n"), mntpt,
+ ((char*)parent)+sizeof(struct parent));
else
- printf(_("p_name = \"%s\"\n"), parent->p_name);
+ printf(_("p_name = \"%s\"\n"),
+ ((char*)parent)+sizeof(struct parent));
}
static int
--
2.7.4
next prev parent reply other threads:[~2018-06-10 5:10 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-10 5:07 [PATCH v2 00/27] xfsprogs: parent pointers v2 Allison Henderson
2018-06-10 5:07 ` [PATCH v2 01/27] xfsprogs: Move xfs_attr.h to libxfs Allison Henderson
2018-06-10 5:07 ` [PATCH v2 02/27] xfsprogs: Add helper function xfs_attr_try_sf_addname Allison Henderson
2018-06-10 5:07 ` [PATCH v2 03/27] xfsprogs: Add trans toggle to attr routines Allison Henderson
2018-06-10 7:02 ` Amir Goldstein
2018-06-10 16:19 ` Allison Henderson
2018-06-10 5:07 ` [PATCH v2 04/27] xfsprogs: Add attibute set and helper functions Allison Henderson
2018-06-10 5:07 ` [PATCH v2 05/27] xfsprogs: Add attibute remove " Allison Henderson
2018-06-10 5:07 ` [PATCH v2 06/27] xfsprogs: Set up infastructure for deferred attribute operations Allison Henderson
2018-06-10 5:07 ` [PATCH v2 07/27] xfsprogs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2018-06-10 5:07 ` [PATCH v2 08/27] xfsprogs: Remove all strlen calls in all xfs_attr_* functions for attr names Allison Henderson
2018-06-10 5:07 ` [PATCH v2 09/27] xfsprogs: get directory offset when adding directory name Allison Henderson
2018-06-10 5:07 ` [PATCH v2 10/27] xfsprogs: get directory offset when removing " Allison Henderson
2018-06-10 5:07 ` [PATCH v2 11/27] xfsprogs: get directory offset when replacing a " Allison Henderson
2018-06-10 5:07 ` [PATCH v2 12/27] xfsprogs: add parent pointer support to attribute code Allison Henderson
2018-06-10 5:07 ` [PATCH v2 13/27] xfsprogs: define parent pointer xattr format Allison Henderson
2018-06-10 5:07 ` [PATCH v2 14/27] xfsprogs: extent transaction reservations for parent attributes Allison Henderson
2018-06-10 5:07 ` [PATCH v2 15/27] xfsprogs: parent pointer attribute creation Allison Henderson
2018-06-10 5:07 ` [PATCH v2 16/27] xfsprogs: Add the parent pointer support to the superblock version 5 Allison Henderson
2018-06-10 5:07 ` [PATCH v2 17/27] xfsprogs: Add helper function xfs_attr_list_context_init Allison Henderson
2018-06-10 5:07 ` [PATCH v2 18/27] xfsprogs: Add parent pointer ioctl Allison Henderson
2018-06-10 5:07 ` [PATCH v2 19/27] xfsprogs: Add delayed attributes error tag Allison Henderson
2018-06-11 17:28 ` Darrick J. Wong
2018-06-11 19:59 ` Allison Henderson
2018-06-10 5:07 ` [PATCH v2 20/27] xfsprogs: Add parent pointer flag to cmd Allison Henderson
2018-06-11 17:43 ` Darrick J. Wong
2018-06-11 20:00 ` Allison Henderson
2018-06-10 5:07 ` Allison Henderson [this message]
2018-06-10 11:21 ` [PATCH v2 21/27] xfsprogs: Remove single byte array from struct parent Amir Goldstein
2018-06-10 15:25 ` Allison Henderson
2018-06-10 5:07 ` [PATCH v2 22/27] xfsprogs: Add log item printing for ATTRI and ATTRD Allison Henderson
2018-06-10 5:07 ` [PATCH v2 23/27] xfsprogs: Do not use namechecks on parent pointers Allison Henderson
2018-06-11 18:00 ` Darrick J. Wong
2018-06-11 20:00 ` Allison Henderson
2018-06-11 20:23 ` Darrick J. Wong
2018-06-11 20:38 ` Allison Henderson
2018-06-10 5:07 ` [PATCH v2 24/27] xfsprogs: Add parent pointers to recreated inodes Allison Henderson
2018-06-10 11:27 ` Amir Goldstein
2018-06-10 17:19 ` Allison Henderson
2018-06-11 17:31 ` Darrick J. Wong
2018-06-11 18:06 ` Darrick J. Wong
2018-06-11 20:00 ` Allison Henderson
2018-06-10 5:07 ` [PATCH v2 25/27] xfsprogs: Add parent pointers during protofile creation Allison Henderson
2018-06-10 11:32 ` Amir Goldstein
2018-06-11 18:15 ` Darrick J. Wong
2018-06-11 19:58 ` Allison Henderson
2018-06-10 5:07 ` [PATCH v2 26/27] xfsprogs: implement the upper half of parent pointers Allison Henderson
2018-06-10 12:06 ` Amir Goldstein
2018-06-10 5:07 ` [PATCH v2 27/27] xfsprogs: Clean up old parent pointer definitions Allison Henderson
2018-06-11 18:20 ` Darrick J. Wong
2018-06-11 20:06 ` Allison Henderson
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=1528607272-11122-22-git-send-email-allison.henderson@oracle.com \
--to=allison.henderson@oracle.com \
--cc=linux-xfs@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;
as well as URLs for NNTP newsgroup(s).