On 12/04/17 05:53, Alex Williamson wrote:
> On Tue, 11 Apr 2017 18:27:49 +1000
> Alexey Kardashevskiy <aik@xxxxxxxxx> wrote:
>
>> On 27/03/17 15:24, David Gibson wrote:
>>> On Mon, Mar 27, 2017 at 02:23:40PM +1100, Alexey Kardashevskiy wrote:
>>>> This adds missing checking for kzalloc() return value.
>>>>
>>>> Fixes: 4b6fad7097f8 ("powerpc/mm/iommu, vfio/spapr: Put pages on VFIO container shutdown")
>>>> Signed-off-by: Alexey Kardashevskiy <aik@xxxxxxxxx>
>>>
>>> Reviewed-by: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
>>
>>
>> Alex?
>
> I've updated my next branch, I've got these from you:
>
> 3393af24b665 vfio/spapr_tce: Check kzalloc() return when preregistering memory
> 1282ba7fc28d vfio/powerpc/spapr_tce: Enforce IOMMU type compatibility check
>
> Am I missing anything else that needs to go through my tree for v4.12?
No, this is all I wanted, thanks. I just did not see in any of your trees
but I see it now.
> Thanks,
>
> Alex
>
>>>> ---
>>>> drivers/vfio/vfio_iommu_spapr_tce.c | 5 +++++
>>>> 1 file changed, 5 insertions(+)
>>>>
>>>> diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c
>>>> b/drivers/vfio/vfio_iommu_spapr_tce.c index
>>>> cf3de91fbfe7..c298bb36e27a 100644 ---
>>>> a/drivers/vfio/vfio_iommu_spapr_tce.c +++
>>>> b/drivers/vfio/vfio_iommu_spapr_tce.c @@ -198,6 +198,11 @@ static
>>>> long tce_iommu_register_pages(struct tce_container *container,
>>>> return ret;
>>>> tcemem = kzalloc(sizeof(*tcemem), GFP_KERNEL);
>>>> + if (!tcemem) {
>>>> + mm_iommu_put(container->mm, mem);
>>>> + return -ENOMEM;
>>>> + }
>>>> +
>>>> tcemem->mem = mem;
>>>> list_add(&tcemem->next, &container->prereg_list);
>>>>
>>>
>>
>>
>
--
Alexey
