iommu/vt-d: Fix out-bounds-warning in intel_svm_page_response()
Subsystems (2)
PATCH 1/1 iommu/vt-d: Fix out-bounds-warning in intel_svm_page_response()
Replace call to memcpy() with just a couple of simple assignments in order to fix the following out-of-bounds warning:
drivers/iommu/intel/svm.c:1198:4: warning: 'memcpy' offset [25, 32] from the object at 'desc' is out of the bounds of referenced subobject 'qw2' with type 'long long unsigned int' at offset 16 [-Warray-bounds]
The problem is that the original code is trying to copy data into a couple of struct members adjacent to each other in a single call to memcpy(). This causes a legitimate compiler warning because memcpy() overruns the length of &desc.qw2.
This helps with the ongoing efforts to globally enable -Warray-bounds and get us closer to being able to tighten the FORTIFY_SOURCE routines on memcpy().
--- drivers/iommu/intel/svm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/iommu/intel/svm.c +4 -3
@@ -1194,9 +1194,10 @@ int intel_svm_page_response(struct device *dev, desc.qw1 =QI_PGRP_IDX (prm->grpid) |QI_PGRP_LPIG (last_page); desc.qw2 =0 ; desc.qw3 =0 ; -if (private_present) -memcpy (&desc.qw2, prm->private_data, -sizeof (prm->private_data)); +if (private_present) { + desc.qw2 = prm->private_data[0 ]; + desc.qw3 = prm->private_data[1 ]; + }qi_submit_sync (iommu, &desc,1 ,0 ); }
Signature · 1 line
2.27.0
Lu Baolu
maintainerHi Gustavo,
Quoted 25 lines · Gustavo A. R. Silva
Replace call to
memcpy()with just a couple of simple assignments in order to fix the following out-of-bounds warning:
drivers/iommu/intel/svm.c:1198:4: warning: 'memcpy' offset [25, 32] from the object at 'desc' is out of the bounds of referenced subobject 'qw2' with type 'long long unsigned int' at offset 16 [-Warray-bounds]The problem is that the original code is trying to copy data into a couple of struct members adjacent to each other in a single call to
memcpy(). This causes a legitimate compiler warning becausememcpy()overruns the length of &desc.qw2.This helps with the ongoing efforts to globally enable -Warray-bounds and get us closer to being able to tighten the
FORTIFY_SOURCEroutines onmemcpy().--- drivers/iommu/intel/svm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/iommu/intel/svm.c +0
-0
drivers/iommu/intel/svm.c int intel_svm_page_response(struct device *dev, · line 1199
Quoted 6 lines
drivers/iommu/intel/svm.c +0
-3@@ -1194,9 +1194,10 @@ int intel_svm_page_response(struct device *dev, desc.qw1 =QI_PGRP_IDX (prm->grpid) |QI_PGRP_LPIG (last_page); desc.qw2 =0 ; desc.qw3 =0 ; -if (private_present) -memcpy (&desc.qw2, prm->private_data, -sizeof (prm->private_data));
The same memcpy() is used in multiple places in this file. Did they compile the same warnings? Or there are multiple patches to fix them one by one?
Best regards,
baolu
drivers/iommu/intel/svm.c int intel_svm_page_response(struct device *dev, · line 1203
Quoted 8 lines
drivers/iommu/intel/svm.c +4
-0+if (private_present) { + desc.qw2 = prm->private_data[0 ]; + desc.qw3 = prm->private_data[1 ]; + }qi_submit_sync (iommu, &desc,1 ,0 ); }
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Hi Balou,
Quoted 24 lines · Lu Baolu
Hi Gustavo,
Quoted 21 lines · Gustavo A. R. Silva
Replace call to
memcpy()with just a couple of simple assignments in order to fix the following out-of-bounds warning:
drivers/iommu/intel/svm.c:1198:4: warning: 'memcpy' offset [25, 32] from the object at 'desc' is out of the bounds of referenced subobject 'qw2' with type 'long long unsigned int' at offset 16 [-Warray-bounds]The problem is that the original code is trying to copy data into a couple of struct members adjacent to each other in a single call to
memcpy(). This causes a legitimate compiler warning becausememcpy()overruns the length of &desc.qw2.This helps with the ongoing efforts to globally enable -Warray-bounds and get us closer to being able to tighten the
FORTIFY_SOURCEroutines onmemcpy().---
drivers/iommu/intel/svm.c| 7 ++++---1 file changed, 4 insertions(+), 3 deletions(-)
Quoted 15 lines
drivers/iommu/intel/svm.c int intel_svm_page_response(struct device *dev, · line 1199
Quoted 11 lines
drivers/iommu/intel/svm.c +0
-3@@ -1194,9 +1194,10 @@ int intel_svm_page_response(struct device *dev, desc.qw1 = QI_PGRP_IDX(prm->grpid) | QI_PGRP_LPIG(last_page); desc.qw2 = 0; desc.qw3 = 0; - if (private_present) - memcpy(&desc.qw2, prm->private_data, - sizeof(prm->private_data));The same
memcpy()is used in multiple places in this file. Did they compile the same warnings? Or there are multiple patches to fix them one by one?
I just see one more instance of this same case:
1023 if (req->priv_data_present)
1024 memcpy(&resp.qw2, req->priv_data,
1025 sizeof(req->priv_data));
I missed it and I'll address it in v2. Do you see another one?
Thanks for the feedback!
--
Gustavo