c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-27 03:19:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix object reclaim when using large dnodes

Browse Source 
Currently, when the receive_object() code wants to reclaim an
object, it always assumes that the dnode is the legacy 512 bytes,
even when the incoming bonus buffer exceeds this length. This
causes a buffer overflow if --enable-debug is not provided and
triggers an ASSERT if it is. This patch resolves this issue and
adds an ASSERT to ensure this can't happen again.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes #7097
Closes #7433
This commit is contained in:
Tom Caputi 2018-04-17 14:13:57 -04:00 committed by Brian Behlendorf
parent 0c03d21ac9
commit e14a32b1c8
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/zfs/dmu_object.c
View File

@ -249,7 +249,7 @@ dmu_object_reclaim(objset_t *os, uint64_t object, dmu_object_type_t ot,
int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx)
{ {
return (dmu_object_reclaim_dnsize(os, object, ot, blocksize, bonustype, return (dmu_object_reclaim_dnsize(os, object, ot, blocksize, bonustype,
bonuslen, 0, tx)); bonuslen, DNODE_MIN_SIZE, tx));
} }
int int

5
module/zfs/dmu_send.c
View File

@ -2606,9 +2606,10 @@ receive_object(struct receive_writer_arg *rwa, struct drr_object *drro,
drro->drr_bonustype != doi.doi_bonus_type || drro->drr_bonustype != doi.doi_bonus_type ||
drro->drr_bonuslen != doi.doi_bonus_size) { drro->drr_bonuslen != doi.doi_bonus_size) {
/* currently allocated, but with different properties */ /* currently allocated, but with different properties */
err = dmu_object_reclaim(rwa->os, drro->drr_object, err = dmu_object_reclaim_dnsize(rwa->os, drro->drr_object,
drro->drr_type, drro->drr_blksz, drro->drr_type, drro->drr_blksz,
drro->drr_bonustype, drro->drr_bonuslen, tx); drro->drr_bonustype, drro->drr_bonuslen,
drro->drr_dn_slots << DNODE_SHIFT, tx);
} }
if (err != 0) { if (err != 0) {
dmu_tx_commit(tx); dmu_tx_commit(tx);

3
module/zfs/dnode.c
View File

@ -676,8 +676,7 @@ dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, int blocksize,
ASSERT(DMU_OT_IS_VALID(bonustype)); ASSERT(DMU_OT_IS_VALID(bonustype));
ASSERT3U(bonuslen, <=, ASSERT3U(bonuslen, <=,
DN_BONUS_SIZE(spa_maxdnodesize(dmu_objset_spa(dn->dn_objset)))); DN_BONUS_SIZE(spa_maxdnodesize(dmu_objset_spa(dn->dn_objset))));
ASSERT3U(bonuslen, <=, DN_BONUS_SIZE(dn_slots << DNODE_SHIFT));
dn_slots = dn_slots > 0 ? dn_slots : DNODE_MIN_SLOTS;
dnode_free_interior_slots(dn); dnode_free_interior_slots(dn);
DNODE_STAT_BUMP(dnode_reallocate); DNODE_STAT_BUMP(dnode_reallocate);

21
tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
View File

@ -13,6 +13,7 @@
# #
# Copyright (c) 2017 by Lawrence Livermore National Security, LLC. # Copyright (c) 2017 by Lawrence Livermore National Security, LLC.
# Copyright (c) 2018 Datto Inc.
# #
. $STF_SUITE/include/libtest.shlib . $STF_SUITE/include/libtest.shlib
@ -31,8 +32,10 @@
# 3. Remove objects, set dnodesize=2k, and remount dataset so new objects # 3. Remove objects, set dnodesize=2k, and remount dataset so new objects
# overlap with recently recycled and formerly "normal" dnode slots get # overlap with recently recycled and formerly "normal" dnode slots get
# assigned to new objects # assigned to new objects
# 4. Generate initial and incremental streams # 4. Create an empty file and add xattrs to it to exercise reclaiming a
# 5. Verify initial and incremental streams can be received # dnode that requires more than 1 slot for its bonus buffer (Zol #7433)
# 5. Generate initial and incremental streams
# 6. Verify initial and incremental streams can be received
# #
verify_runnable "both" verify_runnable "both"
@ -44,6 +47,7 @@ function cleanup
rm -f $BACKDIR/fs-dn-legacy rm -f $BACKDIR/fs-dn-legacy
rm -f $BACKDIR/fs-dn-1k rm -f $BACKDIR/fs-dn-1k
rm -f $BACKDIR/fs-dn-2k rm -f $BACKDIR/fs-dn-2k
rm -f $BACKDIR/fs-attr
if datasetexists $POOL/fs ; then if datasetexists $POOL/fs ; then
log_must zfs destroy -rR $POOL/fs log_must zfs destroy -rR $POOL/fs
@ -82,17 +86,26 @@ log_must zfs unmount $POOL/fs
log_must zfs set dnodesize=2k $POOL/fs log_must zfs set dnodesize=2k $POOL/fs
log_must zfs mount $POOL/fs log_must zfs mount $POOL/fs
log_must touch /$POOL/fs/attrs
mk_files 200 262144 0 $POOL/fs mk_files 200 262144 0 $POOL/fs
log_must zfs snapshot $POOL/fs@c log_must zfs snapshot $POOL/fs@c
# 4. Generate initial and incremental streams # 4. Create an empty file and add xattrs to it to exercise reclaiming a
# dnode that requires more than 1 slot for its bonus buffer (Zol #7433)
log_must zfs set compression=on xattr=sa $POOL/fs
log_must eval "python -c 'print \"a\" * 512' | attr -s bigval /$POOL/fs/attrs"
log_must zfs snapshot $POOL/fs@d
# 5. Generate initial and incremental streams
log_must eval "zfs send $POOL/fs@a > $BACKDIR/fs-dn-1k" log_must eval "zfs send $POOL/fs@a > $BACKDIR/fs-dn-1k"
log_must eval "zfs send -i $POOL/fs@a $POOL/fs@b > $BACKDIR/fs-dn-legacy" log_must eval "zfs send -i $POOL/fs@a $POOL/fs@b > $BACKDIR/fs-dn-legacy"
log_must eval "zfs send -i $POOL/fs@b $POOL/fs@c > $BACKDIR/fs-dn-2k" log_must eval "zfs send -i $POOL/fs@b $POOL/fs@c > $BACKDIR/fs-dn-2k"
log_must eval "zfs send -i $POOL/fs@c $POOL/fs@d > $BACKDIR/fs-attr"
# 5. Verify initial and incremental streams can be received # 6. Verify initial and incremental streams can be received
log_must eval "zfs recv $POOL/newfs < $BACKDIR/fs-dn-1k" log_must eval "zfs recv $POOL/newfs < $BACKDIR/fs-dn-1k"
log_must eval "zfs recv $POOL/newfs < $BACKDIR/fs-dn-legacy" log_must eval "zfs recv $POOL/newfs < $BACKDIR/fs-dn-legacy"
log_must eval "zfs recv $POOL/newfs < $BACKDIR/fs-dn-2k" log_must eval "zfs recv $POOL/newfs < $BACKDIR/fs-dn-2k"
log_must eval "zfs recv $POOL/newfs < $BACKDIR/fs-attr"
log_pass "Verify incremental receive handles objects with changed dnode size" log_pass "Verify incremental receive handles objects with changed dnode size"