File tree Expand file tree Collapse file tree 1 file changed +8
-9
lines changed Expand file tree Collapse file tree 1 file changed +8
-9
lines changed Original file line number Diff line number Diff line change @@ -3511,10 +3511,11 @@ int iommu_attach_group_handle(struct iommu_domain *domain,
3511
3511
{
3512
3512
int ret ;
3513
3513
3514
- if (handle )
3515
- handle -> domain = domain ;
3514
+ if (! handle )
3515
+ return - EINVAL ;
3516
3516
3517
3517
mutex_lock (& group -> mutex );
3518
+ handle -> domain = domain ;
3518
3519
ret = xa_insert (& group -> pasid_array , IOMMU_NO_PASID , handle , GFP_KERNEL );
3519
3520
if (ret )
3520
3521
goto err_unlock ;
@@ -3568,16 +3569,14 @@ int iommu_replace_group_handle(struct iommu_group *group,
3568
3569
void * curr ;
3569
3570
int ret ;
3570
3571
3571
- if (!new_domain )
3572
+ if (!new_domain || ! handle )
3572
3573
return - EINVAL ;
3573
3574
3574
3575
mutex_lock (& group -> mutex );
3575
- if (handle ) {
3576
- ret = xa_reserve (& group -> pasid_array , IOMMU_NO_PASID , GFP_KERNEL );
3577
- if (ret )
3578
- goto err_unlock ;
3579
- handle -> domain = new_domain ;
3580
- }
3576
+ handle -> domain = new_domain ;
3577
+ ret = xa_reserve (& group -> pasid_array , IOMMU_NO_PASID , GFP_KERNEL );
3578
+ if (ret )
3579
+ goto err_unlock ;
3581
3580
3582
3581
ret = __iommu_group_set_domain (group , new_domain );
3583
3582
if (ret )
You can’t perform that action at this time.
0 commit comments