| Message ID | 20220625114239.9301-1-zhiguangni01@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | vfio: check iommu_group_set_name() return value | expand |
> From: Liam Ni <zhiguangni01@gmail.com> > Sent: Saturday, June 25, 2022 7:43 PM > > As iommu_group_set_name() can fail,we should check the return value. > > Signed-off-by: Liam Ni <zhiguangni01@gmail.com> Reviewed-by: Kevin Tian <kevin.tian@intel.com>. btw you probably also want to change other callers of this function for the same issue. > --- > drivers/vfio/vfio.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c > index 61e71c1154be..ca823eeac237 100644 > --- a/drivers/vfio/vfio.c > +++ b/drivers/vfio/vfio.c > @@ -504,7 +504,9 @@ static struct vfio_group > *vfio_noiommu_group_alloc(struct device *dev, > if (IS_ERR(iommu_group)) > return ERR_CAST(iommu_group); > > - iommu_group_set_name(iommu_group, "vfio-noiommu"); > + ret = iommu_group_set_name(iommu_group, "vfio-noiommu"); > + if (ret) > + goto out_put_group; > ret = iommu_group_add_device(iommu_group, dev); > if (ret) > goto out_put_group; > -- > 2.25.1
On Sat, Jun 25, 2022 at 07:42:39PM +0800, Liam Ni wrote: > As iommu_group_set_name() can fail,we should check the return value. > > Signed-off-by: Liam Ni <zhiguangni01@gmail.com> > --- > drivers/vfio/vfio.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) I prefer this - but notice it is not a bug because if iommu_group_set_name() fails then iommu_group_add_device() will return -ENOMEM. Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Jason
On Sat, 25 Jun 2022 19:42:39 +0800 Liam Ni <zhiguangni01@gmail.com> wrote: > As iommu_group_set_name() can fail,we should check the return value. > > Signed-off-by: Liam Ni <zhiguangni01@gmail.com> > --- > drivers/vfio/vfio.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Applied to vfio next branch for v5.20. Thanks, Alex > > diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c > index 61e71c1154be..ca823eeac237 100644 > --- a/drivers/vfio/vfio.c > +++ b/drivers/vfio/vfio.c > @@ -504,7 +504,9 @@ static struct vfio_group *vfio_noiommu_group_alloc(struct device *dev, > if (IS_ERR(iommu_group)) > return ERR_CAST(iommu_group); > > - iommu_group_set_name(iommu_group, "vfio-noiommu"); > + ret = iommu_group_set_name(iommu_group, "vfio-noiommu"); > + if (ret) > + goto out_put_group; > ret = iommu_group_add_device(iommu_group, dev); > if (ret) > goto out_put_group;
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c index 61e71c1154be..ca823eeac237 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c @@ -504,7 +504,9 @@ static struct vfio_group *vfio_noiommu_group_alloc(struct device *dev, if (IS_ERR(iommu_group)) return ERR_CAST(iommu_group); - iommu_group_set_name(iommu_group, "vfio-noiommu"); + ret = iommu_group_set_name(iommu_group, "vfio-noiommu"); + if (ret) + goto out_put_group; ret = iommu_group_add_device(iommu_group, dev); if (ret) goto out_put_group;
As iommu_group_set_name() can fail,we should check the return value. Signed-off-by: Liam Ni <zhiguangni01@gmail.com> --- drivers/vfio/vfio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)