Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a99ff9e9 authored by Shuqi Zhang's avatar Shuqi Zhang Committed by Greg Kroah-Hartman
Browse files

ext4: use kmemdup() to replace kmalloc + memcpy 



[ Upstream commit 4efd9f0d120c55b08852ee5605dbb02a77089a5d ]

Replace kmalloc + memcpy with kmemdup()

Signed-off-by: default avatarShuqi Zhang <zhangshuqi3@huawei.com>
Reviewed-by: default avatarRitesh Harjani <ritesh.list@gmail.com>
Link: https://lore.kernel.org/r/20220525030120.803330-1-zhangshuqi3@huawei.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Stable-dep-of: a44e84a9b776 ("ext4: fix deadlock due to mbcache entry corruption")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 01b688c9

fs/ext4/xattr.c

+1 −2
Original line number Diff line number Diff line
@@ -1911,11 +1911,10 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, 


			unlock_buffer(bs->bh);

			ea_bdebug(bs->bh, "cloning");

			s->base = kmalloc(bs->bh->b_size, GFP_NOFS);

			s->base = kmemdup(BHDR(bs->bh), bs->bh->b_size, GFP_NOFS);

			error = -ENOMEM;

			if (s->base == NULL)

				goto cleanup;

			memcpy(s->base, BHDR(bs->bh), bs->bh->b_size);

			s->first = ENTRY(header(s->base)+1);

			header(s->base)->h_refcount = cpu_to_le32(1);

			s->here = ENTRY(s->base + offset);