From: Shuqi Zhang <zhangshuqi3@huawei.com>
Date: Wed, 25 May 2022 03:01:20 +0000 (+0800)
Subject: ext4: use kmemdup() to replace kmalloc + memcpy
X-Git-Tag: baikal/mips/sdk5.9~30
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=765b0a0f1ea92818df19edf0df3c43c46cf88ac7;p=kernel.git

ext4: use kmemdup() to replace kmalloc + memcpy

[ Upstream commit ab3af306998e1b050dd3ec91294b50e523c9ad1f ]

Replace kmalloc + memcpy with kmemdup()

Signed-off-by: Shuqi Zhang <zhangshuqi3@huawei.com>
Reviewed-by: Ritesh Harjani <ritesh.list@gmail.com>
Link: https://lore.kernel.org/r/20220525030120.803330-1-zhangshuqi3@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index b57fd07fbdbaf..d92d50de5a011 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -1887,11 +1887,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);