Skip to contentSkip to conversation

fs: omfs: use kmemdup() rather than kmalloc+memcpy

PATCH In review Alex Dewar 2 participants 3 messages Aug 24, 2020 – Sep 14, 2020 Omfs filesystem

lore
Share & tools
lore

Alex Dewar

author
#0 lore raw

PATCH 1/1 fs: omfs: use kmemdup() rather than kmalloc+memcpy

Issue identified with Coccinelle.

---
 fs/omfs/inode.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
fs/omfs/inode.c +1 -2
index b76ec6b88ded..8867cefa79cf 100644
@@ -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);
Signature · 1 line
2.28.0
author
#1 lore raw
Quoted 1 line · Alex Dewar

Issue identified with Coccinelle.

Gentle ping?

Quoted 24 lines
---
  fs/omfs/inode.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
fs/omfs/inode.c +1 -2
index b76ec6b88ded..8867cefa79cf 100644
@@ -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);