Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39ffe395 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Joerg Roedel
Browse files

iommu/amd: Take into account that alloc_dev_data() may return NULL 



find_dev_data() does not check whether the return value alloc_dev_data()
is NULL. This was okay once because the pointer was returned once as-is.
Since commit df3f7a6e ("iommu/amd: Use is_attach_deferred
call-back") the pointer may be used within find_dev_data() so a NULL
check is required.

Cc: Baoquan He <bhe@redhat.com>
Fixes: df3f7a6e ("iommu/amd: Use is_attach_deferred call-back")
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 90ca3859

drivers/iommu/amd_iommu.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -310,6 +310,8 @@ static struct iommu_dev_data *find_dev_data(u16 devid) 




	if (dev_data == NULL) {

	if (dev_data == NULL) {

		dev_data = alloc_dev_data(devid);

		dev_data = alloc_dev_data(devid);

		if (!dev_data)

			return NULL;





		if (translation_pre_enabled(iommu))

		if (translation_pre_enabled(iommu))

			dev_data->defer_attach = true;

			dev_data->defer_attach = true;