On 5/20/19 6:17 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> Now that we have name check functions in libxfs, use them instead of our
> custom versions.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
I dig it.
Reviewed-by: Eric Sandeen <sandeen@xxxxxxxxxx>
> ---
> libxfs/libxfs_api_defs.h | 2 ++
> repair/attr_repair.c | 32 +++++++++++++-------------------
> repair/da_util.c | 27 ---------------------------
> repair/da_util.h | 6 ------
> repair/dir2.c | 12 ++----------
> 5 files changed, 17 insertions(+), 62 deletions(-)
>
>
> diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
> index 34bb552d..71a7ef53 100644
> --- a/libxfs/libxfs_api_defs.h
> +++ b/libxfs/libxfs_api_defs.h
> @@ -143,6 +143,8 @@
> #define xfs_default_ifork_ops libxfs_default_ifork_ops
> #define xfs_fs_geometry libxfs_fs_geometry
> #define xfs_init_local_fork libxfs_init_local_fork
> +#define xfs_dir2_namecheck libxfs_dir2_namecheck
> +#define xfs_attr_namecheck libxfs_attr_namecheck
>
> #define LIBXFS_ATTR_ROOT ATTR_ROOT
> #define LIBXFS_ATTR_SECURE ATTR_SECURE
> diff --git a/repair/attr_repair.c b/repair/attr_repair.c
> index 5ad81c09..9a44f610 100644
> --- a/repair/attr_repair.c
> +++ b/repair/attr_repair.c
> @@ -122,14 +122,6 @@ set_da_freemap(xfs_mount_t *mp, da_freemap_t *map, int start, int stop)
> * fork being emptied and put in shortform format.
> */
>
> -static int
> -attr_namecheck(
> - uint8_t *name,
> - int length)
> -{
> - return namecheck((char *)name, length, false);
> -}
> -
> /*
> * This routine just checks what security needs are for attribute values
> * only called when root flag is set, otherwise these names could exist in
> @@ -301,8 +293,8 @@ process_shortform_attr(
> }
>
> /* namecheck checks for null chars in attr names. */
> - if (attr_namecheck(currententry->nameval,
> - currententry->namelen)) {
> + if (!libxfs_attr_namecheck(currententry->nameval,
> + currententry->namelen)) {
> do_warn(
> _("entry contains illegal character in shortform attribute name\n"));
> junkit = 1;
> @@ -464,8 +456,9 @@ process_leaf_attr_local(
> xfs_attr_leaf_name_local_t *local;
>
> local = xfs_attr3_leaf_name_local(leaf, i);
> - if (local->namelen == 0 || attr_namecheck(local->nameval,
> - local->namelen)) {
> + if (local->namelen == 0 ||
> + !libxfs_attr_namecheck(local->nameval,
> + local->namelen)) {
> do_warn(
> _("attribute entry %d in attr block %u, inode %" PRIu64 " has bad name (namelen = %d)\n"),
> i, da_bno, ino, local->namelen);
> @@ -519,13 +512,14 @@ process_leaf_attr_remote(
>
> remotep = xfs_attr3_leaf_name_remote(leaf, i);
>
> - if (remotep->namelen == 0 || attr_namecheck(remotep->name,
> - remotep->namelen) ||
> - be32_to_cpu(entry->hashval) !=
> - libxfs_da_hashname((unsigned char *)&remotep->name[0],
> - remotep->namelen) ||
> - be32_to_cpu(entry->hashval) < last_hashval ||
> - be32_to_cpu(remotep->valueblk) == 0) {
> + if (remotep->namelen == 0 ||
> + !libxfs_attr_namecheck(remotep->name,
> + remotep->namelen) ||
> + be32_to_cpu(entry->hashval) !=
> + libxfs_da_hashname((unsigned char *)&remotep->name[0],
> + remotep->namelen) ||
> + be32_to_cpu(entry->hashval) < last_hashval ||
> + be32_to_cpu(remotep->valueblk) == 0) {
> do_warn(
> _("inconsistent remote attribute entry %d in attr block %u, ino %" PRIu64 "\n"), i, da_bno, ino);
> return -1;
> diff --git a/repair/da_util.c b/repair/da_util.c
> index 4a258e58..8c818ea1 100644
> --- a/repair/da_util.c
> +++ b/repair/da_util.c
> @@ -12,33 +12,6 @@
> #include "bmap.h"
> #include "da_util.h"
>
> -/*
> - * Takes a name and length (name need not be null-terminated) and whether
> - * we are checking a dir (as opposed to an attr).
> - * Returns 1 if the name contains a NUL or if a directory entry contains a '/'.
> - * Returns 0 if the name checks out.
> - */
> -int
> -namecheck(
> - char *name,
> - int length,
> - bool isadir)
> -{
> - char *c;
> - int i;
> -
> - ASSERT(length < MAXNAMELEN);
> -
> - for (c = name, i = 0; i < length; i++, c++) {
> - if (isadir && *c == '/')
> - return 1;
> - if (*c == '\0')
> - return 1;
> - }
> -
> - return 0;
> -}
> -
> /*
> * the cursor gets passed up and down the da btree processing
> * routines. The interior block processing routines use the
> diff --git a/repair/da_util.h b/repair/da_util.h
> index 041dff74..90fec00c 100644
> --- a/repair/da_util.h
> +++ b/repair/da_util.h
> @@ -24,12 +24,6 @@ typedef struct da_bt_cursor {
> struct blkmap *blkmap;
> } da_bt_cursor_t;
>
> -int
> -namecheck(
> - char *name,
> - int length,
> - bool isadir);
> -
> struct xfs_buf *
> da_read_buf(
> xfs_mount_t *mp,
> diff --git a/repair/dir2.c b/repair/dir2.c
> index 094ecb3d..4ac0084e 100644
> --- a/repair/dir2.c
> +++ b/repair/dir2.c
> @@ -44,14 +44,6 @@ _("malloc failed (%zu bytes) dir2_add_badlist:ino %" PRIu64 "\n"),
> l->ino = ino;
> }
>
> -static int
> -dir_namecheck(
> - uint8_t *name,
> - int length)
> -{
> - return namecheck((char *)name, length, true);
> -}
> -
> int
> dir2_is_badino(
> xfs_ino_t ino)
> @@ -318,7 +310,7 @@ _("entry #%d %s in shortform dir %" PRIu64),
> * the length value is stored in a byte
> * so it can't be too big, it can only wrap
> */
> - if (dir_namecheck(sfep->name, namelen)) {
> + if (!libxfs_dir2_namecheck(sfep->name, namelen)) {
> /*
> * junk entry
> */
> @@ -789,7 +781,7 @@ _("\twould clear inode number in entry at offset %" PRIdPTR "...\n"),
> * during phase 4.
> */
> junkit = dep->name[0] == '/';
> - nm_illegal = dir_namecheck(dep->name, dep->namelen);
> + nm_illegal = !libxfs_dir2_namecheck(dep->name, dep->namelen);
> if (ino_discovery && nm_illegal) {
> do_warn(
> _("entry at block %u offset %" PRIdPTR " in directory inode %" PRIu64 " has illegal name \"%*.*s\": "),
>
