Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs (7dac5cb1) · Commits · 戴 / test

Pull btrfs fix from Chris Mason: "I'm still testing more fixes, but I wanted to get out the fix for the btrfs raid5/6 memory corruption I mentioned in my merge window pull" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: fix allocation size calculations in alloc_btrfs_bio

fs/btrfs/volumes.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -4903,10 +4903,17 @@ static void sort_parity_stripes(struct btrfs_bio *bbio, int num_stripes)
		static struct btrfs_bio *alloc_btrfs_bio(int total_stripes, int real_stripes)
		{
		struct btrfs_bio *bbio = kzalloc(
		/* the size of the btrfs_bio */
		sizeof(struct btrfs_bio) +
		/* plus the variable array for the stripes */
		sizeof(struct btrfs_bio_stripe) * (total_stripes) +
		/* plus the variable array for the tgt dev */
		sizeof(int) * (real_stripes) +
		sizeof(u64) * (real_stripes),
		/*
		* plus the raid_map, which includes both the tgt dev
		* and the stripes
		*/
		sizeof(u64) * (total_stripes),
		GFP_NOFS);
		if (!bbio)
		return NULL;

Admin message