diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 3e64d8d51ac4a16c6b980f4702d8d107a39c34b0..d4a218ba626cbcd83abbc23190cc69e63357967e 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5101,6 +5101,9 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
 #endif
 	char *orig_data = kstrdup(data, GFP_KERNEL);
 
+	if (data && !orig_data)
+		return -ENOMEM;
+
 	/* Store the original options */
 	old_sb_flags = sb->s_flags;
 	old_opts.s_mount_opt = sbi->s_mount_opt;