[PATCH 1/1][SRU][Jammy] UBUNTU: SAUCE: media: pci: intel: Avoid UBSAN warnings of index bound and shift

[You-Sheng Yang]

From: Hao Yao <hao.yao at intel.com>

BugLink: https://bugs.launchpad.net/bugs/1958006

UBSAN is default enabled on 5.15 kernel on Ubuntu. The code to
allocate resources in IPU can cause some array-index-out-of-bounds
and shift-out-of-bounds warnings, so it needs to be fixed.

Signed-off-by: Hao Yao <hao.yao at intel.com>
(cherry picked from commit 8dcb7d8df28fd311a72f3d996b02231e38aac8a7 github.com/intel/ipu6-drivers)
Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
 drivers/media/pci/intel/ipu6/ipu-resources.c | 21 ++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/drivers/media/pci/intel/ipu6/ipu-resources.c b/drivers/media/pci/intel/ipu6/ipu-resources.c
index dfe4fde7e83f..07d5aff3b6ce 100644
--- a/drivers/media/pci/intel/ipu6/ipu-resources.c
+++ b/drivers/media/pci/intel/ipu6/ipu-resources.c
@@ -244,7 +244,7 @@ static int __alloc_one_resrc(const struct device *dev,
 	unsigned long retl;
 
 	if (resource_req <= 0)
-		return 0;
+		return -ENXIO;
 
 	if (alloc->resources >= IPU_MAX_RESOURCES) {
 		dev_err(dev, "out of resource handles\n");
@@ -285,7 +285,7 @@ static int ipu_psys_allocate_one_dfm(const struct device *dev,
 	unsigned long p = 0;
 
 	if (dfm_bitmap_req == 0)
-		return 0;
+		return -ENXIO;
 
 	if (alloc->resources >= IPU_MAX_RESOURCES) {
 		dev_err(dev, "out of resource handles\n");
@@ -346,7 +346,7 @@ static int __alloc_mem_resrc(const struct device *dev,
 	unsigned long retl;
 
 	if (memory_resource_req <= 0)
-		return 0;
+		return -ENXIO;
 
 	if (alloc->resources >= IPU_MAX_RESOURCES) {
 		dev_err(dev, "out of resource handles\n");
@@ -488,7 +488,7 @@ int ipu_psys_try_allocate_resources(struct device *dev,
 				ret = __alloc_one_resrc(dev, process,
 							&pool->dev_channels[id],
 							&pm, id, alloc);
-				if (ret)
+				if (ret && ret != -ENXIO)
 					goto free_out;
 			}
 		}
@@ -498,7 +498,7 @@ int ipu_psys_try_allocate_resources(struct device *dev,
 				ret = ipu_psys_allocate_one_dfm
 					(dev, process,
 					 &pool->dfms[id], &pm, id, alloc);
-				if (ret)
+				if (ret && ret != -ENXIO)
 					goto free_out;
 			}
 		}
@@ -522,7 +522,7 @@ int ipu_psys_try_allocate_resources(struct device *dev,
 							&pool->ext_memory[bank],
 							&pm, mem_type_id, bank,
 							alloc);
-				if (ret)
+				if (ret && ret != -ENXIO)
 					goto free_out;
 			}
 		}
@@ -626,6 +626,9 @@ int ipu_psys_allocate_resources(const struct device *dev,
 				ret = __alloc_one_resrc(dev, process,
 							&pool->dev_channels[id],
 							&pm, id, alloc);
+				if (ret == -ENXIO)
+					continue;
+
 				if (ret)
 					goto free_out;
 
@@ -643,6 +646,9 @@ int ipu_psys_allocate_resources(const struct device *dev,
 				ret = ipu_psys_allocate_one_dfm(dev, process,
 								&pool->dfms[id],
 								&pm, id, alloc);
+				if (ret == -ENXIO)
+					continue;
+
 				if (ret)
 					goto free_out;
 
@@ -678,6 +684,9 @@ int ipu_psys_allocate_resources(const struct device *dev,
 							&pool->ext_memory[bank],
 							&pm, mem_type_id,
 							bank, alloc);
+				if (ret == -ENXIO)
+					continue;
+
 				if (ret)
 					goto free_out;
 
-- 
2.34.1