This is a merge-to-userspace of kernel commit a0041684 xfs: zero allocation_args on the kernel stack When calling xfs_alloc_vextent args.userdata was uninitialized, and if we had args.type==XFS_ALLOCTYPE_START_BNO, this uninit structure member got tested, leading to some random allocator behavior. Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx> --- libxfs/xfs_alloc.c | 1 + libxfs/xfs_bmap.c | 3 +++ libxfs/xfs_ialloc.c | 1 + 3 files changed, 5 insertions(+), 0 deletions(-) diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c index a76512d..831040a 100644 --- a/libxfs/xfs_alloc.c +++ b/libxfs/xfs_alloc.c @@ -1788,6 +1788,7 @@ xfs_alloc_fix_freelist( /* * Initialize the args structure. */ + memset(&targs, 0, sizeof(targs)); targs.tp = tp; targs.mp = mp; targs.agbp = agbp; diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index 5a626b0..883035e 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -2411,6 +2411,7 @@ xfs_bmap_btalloc( * Normal allocation, done through xfs_alloc_vextent. */ tryagain = isaligned = 0; + memset(&args, 0, sizeof(args)); args.tp = ap->tp; args.mp = mp; args.fsbno = ap->rval; @@ -3044,6 +3045,7 @@ xfs_bmap_extents_to_btree( * Convert to a btree with two levels, one record in root. */ XFS_IFORK_FMT_SET(ip, whichfork, XFS_DINODE_FMT_BTREE); + memset(&args, 0, sizeof(args)); args.tp = tp; args.mp = mp; args.firstblock = *firstblock; @@ -3205,6 +3207,7 @@ xfs_bmap_local_to_extents( xfs_buf_t *bp; /* buffer for extent block */ xfs_bmbt_rec_host_t *ep;/* extent record pointer */ + memset(&args, 0, sizeof(args)); args.tp = tp; args.mp = ip->i_mount; args.firstblock = *firstblock; diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c index 1fcafb6..f97dc4d 100644 --- a/libxfs/xfs_ialloc.c +++ b/libxfs/xfs_ialloc.c @@ -232,6 +232,7 @@ xfs_ialloc_ag_alloc( /* boundary */ struct xfs_perag *pag; + memset(&args, 0, sizeof(args)); args.tp = tp; args.mp = tp->t_mountp; -- 1.7.1 _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs
