]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
fs: omfs: use kmemdup() rather than kmalloc+memcpy
authorAlex Dewar <alex.dewar90@gmail.com>
Mon, 14 Sep 2020 17:57:01 +0000 (18:57 +0100)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 23 Sep 2020 03:39:45 +0000 (23:39 -0400)
Issue identified with Coccinelle.

Signed-off-by: Alex Dewar <alex.dewar90@gmail.com>
Acked-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/omfs/inode.c

index 68aa38a48308262abe6a28d44190e7f1bb4306bd..ce93ccca86392badb8e7ecb490f0252e5342484d 100644 (file)
@@ -362,12 +362,11 @@ static int omfs_get_imap(struct super_block *sb)
                bh = sb_bread(sb, block++);
                if (!bh)
                        goto nomem_free;
-               *ptr = kmalloc(sb->s_blocksize, GFP_KERNEL);
+               *ptr = kmemdup(bh->b_data, sb->s_blocksize, GFP_KERNEL);
                if (!*ptr) {
                        brelse(bh);
                        goto nomem_free;
                }
-               memcpy(*ptr, bh->b_data, sb->s_blocksize);
                if (count < sb->s_blocksize)
                        memset((void *)*ptr + count, 0xff,
                                sb->s_blocksize - count);