Commit 53f61313 authored by Yang Yingliang's avatar Yang Yingliang Committed by Joerg Roedel

iommu/arm-smmu: Fix missing unlock on error in arm_smmu_device_group()

Add the missing unlock before return from function arm_smmu_device_group()
in the error handling case.

Fixes: b1a13479 ("iommu/arm-smmu: Fix race condition during iommu_group creation")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20210820074949.1946576-1-yangyingliang@huawei.comSigned-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent af1d321c
...@@ -1488,8 +1488,10 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev) ...@@ -1488,8 +1488,10 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev)
mutex_lock(&smmu->stream_map_mutex); mutex_lock(&smmu->stream_map_mutex);
for_each_cfg_sme(cfg, fwspec, i, idx) { for_each_cfg_sme(cfg, fwspec, i, idx) {
if (group && smmu->s2crs[idx].group && if (group && smmu->s2crs[idx].group &&
group != smmu->s2crs[idx].group) group != smmu->s2crs[idx].group) {
mutex_unlock(&smmu->stream_map_mutex);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
}
group = smmu->s2crs[idx].group; group = smmu->s2crs[idx].group;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment