diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-01 16:56:00 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-01 16:56:00 -0700 |
| commit | 8db82e3c1db140397db0654161b8f91f8bc5a8d2 (patch) | |
| tree | 531f46fe74d432cd4d535d7421458525a819462c | |
| parent | 2ce111aca6fe9bea5bff224155991edc80f4219f (diff) | |
| parent | aecadd7140eff321005c8da286bf66c1fa235024 (diff) | |
Merge "iommu: iommu-debug: limit memory address exposure"
| -rw-r--r-- | drivers/iommu/iommu-debug.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/iommu/iommu-debug.c b/drivers/iommu/iommu-debug.c index b8155c9227d3..c21846c1f8d5 100644 --- a/drivers/iommu/iommu-debug.c +++ b/drivers/iommu/iommu-debug.c @@ -1491,6 +1491,10 @@ static ssize_t iommu_debug_pte_read(struct file *file, char __user *ubuf, ssize_t retval; size_t buflen; + if (kptr_restrict != 0) { + pr_err("kptr_restrict needs to be disabled.\n"); + return -EPERM; + } if (!dev->archdata.mapping) { pr_err("No mapping. Did you already attach?\n"); return -EINVAL; @@ -1610,6 +1614,10 @@ static ssize_t iommu_debug_dma_atos_read(struct file *file, char __user *ubuf, ssize_t retval; size_t buflen; + if (kptr_restrict != 0) { + pr_err("kptr_restrict needs to be disabled.\n"); + return -EPERM; + } if (!dev->archdata.mapping) { pr_err("No mapping. Did you already attach?\n"); return -EINVAL; |