2020-08-24 21:21:49

by Alex Dewar

Subject: [PATCH] fs: omfs: use kmemdup() rather than kmalloc+memcpy

Issue identified with Coccinelle.

Signed-off-by: Alex Dewar <[email protected]>
---
fs/omfs/inode.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
index b76ec6b88ded..8867cefa79cf 100644
--- a/fs/omfs/inode.c
+++ b/fs/omfs/inode.c
@@ -363,12 +363,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);
--
2.28.0

2020-09-09 19:08:05

by Alex Dewar

Subject: Re: [PATCH] fs: omfs: use kmemdup() rather than kmalloc+memcpy

On 24/08/2020 22:17, Alex Dewar wrote:
> Issue identified with Coccinelle.
Gentle ping?
>
> Signed-off-by: Alex Dewar <[email protected]>
> ---
> fs/omfs/inode.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
> index b76ec6b88ded..8867cefa79cf 100644
> --- a/fs/omfs/inode.c
> +++ b/fs/omfs/inode.c
> @@ -363,12 +363,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);

2020-09-14 13:15:48

by Bob Copeland

Subject: Re: [PATCH] fs: omfs: use kmemdup() rather than kmalloc+memcpy

On Wed, Sep 09, 2020 at 08:04:15PM +0100, Alex Dewar wrote:
> On 24/08/2020 22:17, Alex Dewar wrote:
> > Issue identified with Coccinelle.
> Gentle ping?
> >
> > Signed-off-by: Alex Dewar <[email protected]>

Acked-by: Bob Copeland <[email protected]>

However, I don't have a git tree for OMFS so you'll need to send it
through vfs tree or so.

--
Bob Copeland %% https://bobcopeland.com/