iommu/vt-d: Fix out-bounds-warning in intel_svm_page_response()
Subsystems (2)
PATCH v2 1/1 iommu/vt-d: Fix out-bounds-warning in intel_svm_page_response()
Replace a couple of calls to memcpy() with 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 and &resp.qw2, respectively.
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().
---
Changes in v2:
- Fix another instance of this same issue in prq_event_thread().
drivers/iommu/intel/svm.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/iommu/intel/svm.c +8 -6
@@ -1020,9 +1020,10 @@ static irqreturn_t prq_event_thread(int irq, void *d) resp.qw2 =0 ; resp.qw3 =0 ; -if (req->priv_data_present) -memcpy (&resp.qw2, req->priv_data, -sizeof (req->priv_data)); +if (req->priv_data_present) { + resp.qw2 = req->priv_data[0 ]; + resp.qw3 = req->priv_data[1 ]; + }qi_submit_sync (iommu, &resp,1 ,0 ); } prq_advance:
@@ -1194,9 +1195,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
Quoted 10 lines · Gustavo A. R. Silva
Replace a couple of calls to
memcpy()with 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 and &resp.qw2, respectively.
Quoted 6 lines
This helps with the ongoing efforts to globally enable -Warray-bounds and get us closer to being able to tighten the
FORTIFY_SOURCEroutines onmemcpy().
Queued for v5.14. Thanks!
Best regards,
baolu