xfs
[Top] [All Lists]

REVIEW: Zero uninitialised xfs_da_args structure in xfs_dir2.c

To: "xfs@xxxxxxxxxxx" <xfs@xxxxxxxxxxx>
Subject: REVIEW: Zero uninitialised xfs_da_args structure in xfs_dir2.c
From: "Barry Naujok" <bnaujok@xxxxxxx>
Date: Mon, 02 Jun 2008 15:42:55 +1000
Organization: SGI
Sender: xfs-bounce@xxxxxxxxxxx
User-agent: Opera Mail/9.24 (Win32)
In particular, this patch fixes a problem in the xfs_dir2_remove and
xfs_dir2_replace paths which internally can call a lookup function
which will use args->cmpresult which is uninitialised.

--

Index: 2.6.x-xfs/fs/xfs/xfs_dir2.c
===================================================================
--- 2.6.x-xfs.orig/fs/xfs/xfs_dir2.c
+++ 2.6.x-xfs/fs/xfs/xfs_dir2.c
@@ -213,6 +213,7 @@ xfs_dir_createname(
        if ((rval = xfs_dir_ino_validate(tp->t_mountp, inum)))
                return rval;
        XFS_STATS_INC(xs_dir_create);
+       memset(&args, 0, sizeof(xfs_da_args_t));

        args.name = name->name;
        args.namelen = name->len;
@@ -297,7 +298,6 @@ xfs_dir_lookup(
        args.op_flags = XFS_DA_OP_OKNOENT;
        if (ci_name)
                args.op_flags |= XFS_DA_OP_CILOOKUP;
-       args.cmpresult = XFS_CMP_DIFFERENT;

        if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
                rval = xfs_dir2_sf_lookup(&args);
@@ -342,6 +342,7 @@ xfs_dir_removename(

        ASSERT((dp->i_d.di_mode & S_IFMT) == S_IFDIR);
        XFS_STATS_INC(xs_dir_remove);
+       memset(&args, 0, sizeof(xfs_da_args_t));

        args.name = name->name;
        args.namelen = name->len;
@@ -353,7 +354,6 @@ xfs_dir_removename(
        args.total = total;
        args.whichfork = XFS_DATA_FORK;
        args.trans = tp;
-       args.op_flags = 0;

        if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
                rval = xfs_dir2_sf_removename(&args);
@@ -425,6 +425,7 @@ xfs_dir_replace(

        if ((rval = xfs_dir_ino_validate(tp->t_mountp, inum)))
                return rval;
+       memset(&args, 0, sizeof(xfs_da_args_t));

        args.name = name->name;
        args.namelen = name->len;
@@ -436,7 +437,6 @@ xfs_dir_replace(
        args.total = total;
        args.whichfork = XFS_DATA_FORK;
        args.trans = tp;
-       args.op_flags = 0;

        if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
                rval = xfs_dir2_sf_replace(&args);



<Prev in Thread] Current Thread [Next in Thread>