From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Williamson Subject: Re: [PATCH -next] iommu/ipmmu-vmsa: Fix return value check in ipmmu_find_group_dma() Date: Mon, 6 Nov 2017 13:05:31 -0700 Message-ID: <20171106130531.7e577178@t450s.home> References: <1508242282-73764-1-git-send-email-weiyongjun1@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1508242282-73764-1-git-send-email-weiyongjun1-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Wei Yongjun Cc: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: iommu@lists.linux-foundation.org On Tue, 17 Oct 2017 12:11:22 +0000 Wei Yongjun wrote: > In case of error, the function iommu_group_get() returns NULL pointer > not ERR_PTR(). The IS_ERR() test in the return value check should be > replaced with NULL test. > > Fixes: 3ae47292024f ("iommu/ipmmu-vmsa: Add new IOMMU_DOMAIN_DMA ops") > Signed-off-by: Wei Yongjun > --- > drivers/iommu/ipmmu-vmsa.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c > index af81400..00e88a8 100644 > --- a/drivers/iommu/ipmmu-vmsa.c > +++ b/drivers/iommu/ipmmu-vmsa.c > @@ -871,7 +871,7 @@ static struct iommu_group *ipmmu_find_group_dma(struct device *dev) > sibling = ipmmu_find_sibling_device(dev); > if (sibling) > group = iommu_group_get(sibling); > - if (!sibling || IS_ERR(group)) > + if (!sibling || !group) > group = generic_device_group(dev); > > return group; Applied to iommu/ipmmu-vmsa for v4.15. Note that Robin's patch series[1] reworks this code, removing the call to iommu_group_get(), but it seems correct in case anyone wants to cherry pick it for backports. Thanks, Alex [1]https://www.spinics.net/lists/linux-renesas-soc/msg19228.html