D27731.id81073.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D27731.id81073.diff
View Options

	Index: sys/kern/kern_malloc.c
	===================================================================
	--- sys/kern/kern_malloc.c
	+++ sys/kern/kern_malloc.c
	@@ -876,6 +876,7 @@
	uma_zfree_arg(zone, addr, slab);
	} else {
	size = malloc_large_size(slab);
	+ kasan_mark(addr, size, size, 0);
	free_large(addr, size);
	}
	malloc_type_freed(mtp, size);
	@@ -918,6 +919,7 @@
	uma_zfree_arg(zone, addr, slab);
	} else {
	size = malloc_large_size(slab);
	+ kasan_mark(addr, size, size, 0);
	explicit_bzero(addr, size);
	free_large(addr, size);
	}
	Index: sys/ufs/ffs/ffs_snapshot.c
	===================================================================
	--- sys/ufs/ffs/ffs_snapshot.c
	+++ sys/ufs/ffs/ffs_snapshot.c
	@@ -385,8 +385,8 @@
	* touch up the few cylinder groups that changed during
	* the suspension period.
	*/
	- len = howmany(fs->fs_ncg, NBBY);
	- space = malloc(len, M_DEVBUF, M_WAITOK\|M_ZERO);
	+ len = roundup2(howmany(fs->fs_ncg, NBBY), sizeof(int));
	+ space = malloc(len, M_DEVBUF, M_WAITOK \| M_ZERO);
	UFS_LOCK(ump);
	fs->fs_active = space;
	UFS_UNLOCK(ump);