Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'xfs-5.3-fixes-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs fixes from Darrick Wong:
- Avoid leaking kernel stack contents to userspace
- Fix a potential null pointer dereference in the dabtree scrub code
* tag 'xfs-5.3-fixes-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
xfs: Fix possible null-pointer dereferences in xchk_da_btree_block_check_sibling()
xfs: fix stack contents leakage in the v1 inumber ioctls
+8
-1
+5
-1
fs/xfs/scrub/dabtree.c
+5
-1
fs/xfs/scrub/dabtree.c
···
278
278
/* Compare upper level pointer to sibling pointer. */
279
279
if (ds->state->altpath.blk[level].blkno != sibling)
280
280
xchk_da_set_corrupt(ds, level);
281
-
xfs_trans_brelse(ds->dargs.trans, ds->state->altpath.blk[level].bp);
281
+
if (ds->state->altpath.blk[level].bp) {
282
+
xfs_trans_brelse(ds->dargs.trans,
283
+
ds->state->altpath.blk[level].bp);
284
+
ds->state->altpath.blk[level].bp = NULL;
285
+
}
282
286
out:
283
287
return error;
284
288
}
+3
fs/xfs/xfs_itable.c
+3
fs/xfs/xfs_itable.c
···
272
272
struct xfs_bstat *bs1,
273
273
const struct xfs_bulkstat *bstat)
274
274
{
275
+
/* memset is needed here because of padding holes in the structure. */
275
276
memset(bs1, 0, sizeof(struct xfs_bstat));
276
277
bs1->bs_ino = bstat->bs_ino;
277
278
bs1->bs_mode = bstat->bs_mode;
···
389
388
struct xfs_inogrp *ig1,
390
389
const struct xfs_inumbers *ig)
391
390
{
391
+
/* memset is needed here because of padding holes in the structure. */
392
+
memset(ig1, 0, sizeof(struct xfs_inogrp));
392
393
ig1->xi_startino = ig->xi_startino;
393
394
ig1->xi_alloccount = ig->xi_alloccount;
394
395
ig1->xi_allocmask = ig->xi_allocmask;