Skip to contentSkip to conversation

fpga: dfl-afu-region: Add overflow checks for region size and offset

PATCH In review [email protected] 4 participants 5 messages Feb 6, 2023 – Apr 10, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fpga: dfl-afu-region: Add overflow checks for region size and offset

From: Sangsup Lee <[email protected]>

The size + offset is able to be integer overflow value and it lead to mis-allocate region.

---
 drivers/fpga/dfl-afu-region.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/fpga/dfl-afu-region.c +6 -1
index 2e7b41629406..82b530111601 100644
@@ -151,12 +151,17 @@ int afu_mmio_region_get_by_offset(struct dfl_feature_platform_data *pdata,
 	struct dfl_afu_mmio_region *region;
 	struct dfl_afu *afu;
 	int ret = 0;
+	u64 region_size = 0;
 
 	mutex_lock(&pdata->lock);
+	if (check_add_overflow(offset, size, &region_size)) {
+		ret = -EINVAL;
+		goto exit;
+	}
 	afu = dfl_fpga_pdata_get_private(pdata);
 	for_each_region(region, afu)
 		if (region->offset <= offset &&
-		    region->offset + region->size >= offset + size) {
+		    region->offset + region->size >= region_size) {
 			*pregion = *region;
 			goto exit;
 		}
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 3 lines · On 2/5/23 21:43, [email protected] wrote:

From: Sangsup Lee <[email protected]>

The size + offset is able to be integer overflow value and it lead to mis-allocate region.

Quoted 28 lines
---
 drivers/fpga/dfl-afu-region.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/fpga/dfl-afu-region.c +6 -1
index 2e7b41629406..82b530111601 100644
@@ -151,12 +151,17 @@ int afu_mmio_region_get_by_offset(struct dfl_feature_platform_data *pdata,
 	struct dfl_afu_mmio_region *region;
 	struct dfl_afu *afu;
 	int ret = 0;
+	u64 region_size = 0;
 
 	mutex_lock(&pdata->lock);
+	if (check_add_overflow(offset, size, &region_size)) {
+		ret = -EINVAL;
+		goto exit;
+	}
 	afu = dfl_fpga_pdata_get_private(pdata);
 	for_each_region(region, afu)
 		if (region->offset <= offset &&
-		    region->offset + region->size >= offset + size) {
+		    region->offset + region->size >= region_size) {
 			*pregion = *region;
 			goto exit;
 		}
maintainer
#2 lore raw
In reply to [email protected]
Quoted 3 lines · On 2023-02-05 at 21:43:26 -0800, [email protected] wrote:

From: Sangsup Lee <[email protected]>

The size + offset is able to be integer overflow value and it lead to mis-allocate region.

But I didn't see the memory allocation.

Quoted 11 lines
---
 drivers/fpga/dfl-afu-region.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/fpga/dfl-afu-region.c +0 -0
index 2e7b41629406..82b530111601 100644

drivers/fpga/dfl-afu-region.c int afu_mmio_region_get_by_offset(struct dfl_feature_platform_data *pdata, · line 154

Quoted 4 lines
drivers/fpga/dfl-afu-region.c +1 -0
@@ -151,12 +151,17 @@ int afu_mmio_region_get_by_offset(struct dfl_feature_platform_data *pdata,
 	struct dfl_afu_mmio_region *region;
 	struct dfl_afu *afu;
 	int ret = 0;
+	u64 region_size = 0;

Reverse Xmax tree please.

drivers/fpga/dfl-afu-region.c int afu_mmio_region_get_by_offset(struct dfl_feature_platform_data *pdata, · line 157

Quoted 3 lines
drivers/fpga/dfl-afu-region.c +1 -0
 	mutex_lock(&pdata->lock);
+	if (check_add_overflow(offset, size, &region_size)) {

I'm not sure if the check is necessary.

The offset comes from: offset = vma->vm_pgoff << PAGE_SHIFT The size comes from: size = vma->vm_end - vma->vm_start Is it possible the upper mm layer passes invalid vma?

Thanks,
Yilun

Quoted 14 lines
drivers/fpga/dfl-afu-region.c +4 -1
+		ret = -EINVAL;
+		goto exit;
+	}
 	afu = dfl_fpga_pdata_get_private(pdata);
 	for_each_region(region, afu)
 		if (region->offset <= offset &&
-		    region->offset + region->size >= offset + size) {
+		    region->offset + region->size >= region_size) {
 			*pregion = *region;
 			goto exit;
 		}
Signature · 1 line
2.25.1
#3 lore raw

Hi,

Quoted 31 lines · Xu Yilun
Quoted 3 lines · On 2023-02-05 at 21:43:26 -0800, [email protected] wrote:

From: Sangsup Lee <[email protected]>

The size + offset is able to be integer overflow value and it lead to mis-allocate region.

But I didn't see the memory allocation.

Quoted 11 lines
---
 drivers/fpga/dfl-afu-region.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/fpga/dfl-afu-region.c +0 -0
index 2e7b41629406..82b530111601 100644

drivers/fpga/dfl-afu-region.c int afu_mmio_region_get_by_offset(struct dfl_feature_platform_data *pdata, · line 154

Quoted 4 lines
drivers/fpga/dfl-afu-region.c +1 -0
@@ -151,12 +151,17 @@ int afu_mmio_region_get_by_offset(struct dfl_feature_platform_data *pdata,
 	struct dfl_afu_mmio_region *region;
 	struct dfl_afu *afu;
 	int ret = 0;
+	u64 region_size = 0;

Reverse Xmax tree please.

drivers/fpga/dfl-afu-region.c int afu_mmio_region_get_by_offset(struct dfl_feature_platform_data *pdata, · line 157

Quoted 3 lines
drivers/fpga/dfl-afu-region.c +1 -0
 	mutex_lock(&pdata->lock);
+	if (check_add_overflow(offset, size, &region_size)) {

I'm not sure if the check is necessary.

Quoted 6 lines

The offset comes from: offset = vma->vm_pgoff << PAGE_SHIFT The size comes from: size = vma->vm_end - vma->vm_start Is it possible the upper mm layer passes invalid vma?

Thanks,
Yilun

Did you saw the comments on your patch by Yilun? Did it felt trough the cracks?

Regards,
Salvatore

#4 lore raw

Hi,

In my opinion the code has an insecure code pattern.
The size may have integer overflow condition i think.
But, I did not do dynamic analysis but I did static audit fpga code(I don't have an fpga device).
because of this. I don't make sure about Yilun's comment. I think the code must have defensive coding rules.

best regards.