lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sat, 4 Jul 2020 04:26:17 -0700 From: Liu Yi L <yi.l.liu@...el.com> To: alex.williamson@...hat.com, eric.auger@...hat.com, baolu.lu@...ux.intel.com, joro@...tes.org Cc: kevin.tian@...el.com, jacob.jun.pan@...ux.intel.com, ashok.raj@...el.com, yi.l.liu@...el.com, jun.j.tian@...el.com, yi.y.sun@...el.com, jean-philippe@...aro.org, peterx@...hat.com, hao.wu@...el.com, stefanha@...il.com, iommu@...ts.linux-foundation.org, kvm@...r.kernel.org, linux-kernel@...r.kernel.org, Will Deacon <will@...nel.org>, Robin Murphy <robin.murphy@....com> Subject: [PATCH v4 03/15] iommu/smmu: Report empty domain nesting info Cc: Will Deacon <will@...nel.org> Cc: Robin Murphy <robin.murphy@....com> Cc: Eric Auger <eric.auger@...hat.com> Cc: Jean-Philippe Brucker <jean-philippe@...aro.org> Suggested-by: Jean-Philippe Brucker <jean-philippe@...aro.org> Signed-off-by: Liu Yi L <yi.l.liu@...el.com> Signed-off-by: Jacob Pan <jacob.jun.pan@...ux.intel.com> --- drivers/iommu/arm-smmu-v3.c | 29 +++++++++++++++++++++++++++-- drivers/iommu/arm-smmu.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index f578677..0c45d4d 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -3019,6 +3019,32 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev) return group; } +static int arm_smmu_domain_nesting_info(struct arm_smmu_domain *smmu_domain, + void *data) +{ + struct iommu_nesting_info *info = (struct iommu_nesting_info *) data; + u32 size; + + if (!info || smmu_domain->stage != ARM_SMMU_DOMAIN_NESTED) + return -ENODEV; + + size = sizeof(struct iommu_nesting_info); + + /* + * if provided buffer size is not equal to the size, should + * return 0 and also the expected buffer size to caller. + */ + if (info->size != size) { + info->size = size; + return 0; + } + + /* report an empty iommu_nesting_info for now */ + memset(info, 0x0, size); + info->size = size; + return 0; +} + static int arm_smmu_domain_get_attr(struct iommu_domain *domain, enum iommu_attr attr, void *data) { @@ -3028,8 +3054,7 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain, case IOMMU_DOMAIN_UNMANAGED: switch (attr) { case DOMAIN_ATTR_NESTING: - *(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED); - return 0; + return arm_smmu_domain_nesting_info(smmu_domain, data); default: return -ENODEV; } diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 243bc4c..908607d 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1506,6 +1506,32 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev) return group; } +static int arm_smmu_domain_nesting_info(struct arm_smmu_domain *smmu_domain, + void *data) +{ + struct iommu_nesting_info *info = (struct iommu_nesting_info *) data; + u32 size; + + if (!info || smmu_domain->stage != ARM_SMMU_DOMAIN_NESTED) + return -ENODEV; + + size = sizeof(struct iommu_nesting_info); + + /* + * if provided buffer size is not equal to the size, should + * return 0 and also the expected buffer size to caller. + */ + if (info->size != size) { + info->size = size; + return 0; + } + + /* report an empty iommu_nesting_info for now */ + memset(info, 0x0, size); + info->size = size; + return 0; +} + static int arm_smmu_domain_get_attr(struct iommu_domain *domain, enum iommu_attr attr, void *data) { @@ -1515,8 +1541,7 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain, case IOMMU_DOMAIN_UNMANAGED: switch (attr) { case DOMAIN_ATTR_NESTING: - *(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED); - return 0; + return arm_smmu_domain_nesting_info(smmu_domain, data); default: return -ENODEV; } -- 2.7.4
Powered by blists - more mailing lists