clear-pkgs-linux-iot-lts2018/0952-media-intel-ipu4-fix-2...

36 lines
1.1 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Meng Wei <wei.meng@intel.com>
Date: Mon, 3 Dec 2018 16:53:09 +0800
Subject: [PATCH] media: intel-ipu4: fix 2 kernel panic in ipu driver
fix 2 kernel panic in ipu driver:
1, double free
2, memcpy after allocation failed.
Change-Id: Ic50b3428410ff47377009f472fa425acb860211f
Tracked-On: PKT-1691
Signed-off-by: Zhang Ning <ning.a.zhang@intel.com>
Signed-off-by: Meng Wei <wei.meng@intel.com>
---
drivers/media/pci/intel/ipu.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/media/pci/intel/ipu.c b/drivers/media/pci/intel/ipu.c
2020-10-27 02:14:06 +08:00
index b235de1be6ec..39dfb7b519de 100644
--- a/drivers/media/pci/intel/ipu.c
+++ b/drivers/media/pci/intel/ipu.c
@@ -334,6 +334,10 @@ int request_cpd_fw(const struct firmware **firmware_p, const char *name,
return -ENOMEM;
tmp->size = fw->size;
tmp->data = vmalloc(fw->size);
+ if (!tmp->data) {
+ kfree(tmp);
+ return -ENOMEM;
+ }
memcpy((void *)tmp->data, fw->data, fw->size);
*firmware_p = tmp;
release_firmware(fw);
--
https://clearlinux.org