Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "iommu: Do more input validation in iommu_map_sg()"

This commit is contained in:
Linux Build Service Account 2015-03-17 11:16:22 -07:00 committed by Gerrit - the friendly Code Review server
parent 633eae512c 54c4e71db5
commit 0fb7333814
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/iommu/iommu.c
View File

@ -911,26 +911,33 @@ EXPORT_SYMBOL_GPL(iommu_unmap);
size_t default_iommu_map_sg(struct iommu_domain *domain, unsigned long iova,
struct scatterlist *sg, unsigned int nents, int prot)
{
int ret;
struct scatterlist *s;
size_t mapped = 0;
unsigned int i;
struct scatterlist *s;
int ret;
for_each_sg(sg, s, nents, i) {
phys_addr_t phys = page_to_phys(sg_page(s));
size_t page_len = s->offset + s->length;
ret = iommu_map(domain, iova + mapped, phys, page_len, prot);
if (ret) {
/* undo mappings already done */
iommu_unmap(domain, iova, mapped);
mapped = 0;
break;
}
mapped += page_len;
/* We are mapping on page boundarys, so offset must be 0 */
if (s->offset)
goto out_err;
ret = iommu_map(domain, iova + mapped, phys, s->length, prot);
if (ret)
goto out_err;
mapped += s->length;
}
return mapped;
out_err:
/* undo mappings already done */
iommu_unmap(domain, iova, mapped);
return 0;
}
EXPORT_SYMBOL_GPL(default_iommu_map_sg);