lkml.org 
[lkml]   [2020]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 25/78] xfs: initialize the shortform attr header padding entry
    Date
    From: Darrick J. Wong <darrick.wong@oracle.com>

    [ Upstream commit 125eac243806e021f33a1fdea3687eccbb9f7636 ]

    Don't leak kernel memory contents into the shortform attr fork.

    Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
    Reviewed-by: Eric Sandeen <sandeen@redhat.com>
    Reviewed-by: Dave Chinner <dchinner@redhat.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/xfs/libxfs/xfs_attr_leaf.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
    index 087a5715cf20e..bd37f4a292c3b 100644
    --- a/fs/xfs/libxfs/xfs_attr_leaf.c
    +++ b/fs/xfs/libxfs/xfs_attr_leaf.c
    @@ -551,8 +551,8 @@ xfs_attr_shortform_create(xfs_da_args_t *args)
    ASSERT(ifp->if_flags & XFS_IFINLINE);
    }
    xfs_idata_realloc(dp, sizeof(*hdr), XFS_ATTR_FORK);
    - hdr = (xfs_attr_sf_hdr_t *)ifp->if_u1.if_data;
    - hdr->count = 0;
    + hdr = (struct xfs_attr_sf_hdr *)ifp->if_u1.if_data;
    + memset(hdr, 0, sizeof(*hdr));
    hdr->totsize = cpu_to_be16(sizeof(*hdr));
    xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_ADATA);
    }
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-09-15 16:53    [W:2.282 / U:0.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site