Btrfs: kmalloc() doesn't return an ERR_PTR

PATCH New Dan Carpenter 1 participant 1 message Mar 28, 2014

Subsystems (2)

Kernel janitors Btrfs file system

lore

Share & tools

lore

Dan Carpenter

author

2014-03-28 08:06 UTC #0 lore raw

PATCH 1/1 Btrfs: kmalloc() doesn't return an ERR_PTR

The error handling was copy and pasted from memdup_user(). It should be checking for NULL obviously.

Fixes abccd00f8af2 ('btrfs: Fix 32/64-bit problem with BTRFS_SET_RECEIVED_SUBVOL ioctl')

Signed-off-by Dan Carpenter <[email protected]>

fs/btrfs/ioctl.c +2 -3

index 0401397..27d551c 100644
@@ -4531,9 +4531,8 @@ static long btrfs_ioctl_set_received_subvol_32(struct file *file,
 	}
 
 	args64 = kmalloc(sizeof(*args64), GFP_NOFS);
-	if (IS_ERR(args64)) {
-		ret = PTR_ERR(args64);
-		args64 = NULL;
+	if (!args64) {
+		ret = -ENOMEM;
 		goto out;
 	}