diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2018-03-22 16:22:33 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2018-03-29 10:38:14 +0200 |
| commit | 39ffe39545cd5cb5b8cee9f0469165cf24dc62c2 (patch) | |
| tree | bc75f5ff338a71b941e204c1611dc7d7cb44f891 /drivers/iommu | |
| parent | iommu/amd: Use dev_err to send events to the system log (diff) | |
| download | linux-39ffe39545cd5cb5b8cee9f0469165cf24dc62c2.tar.xz linux-39ffe39545cd5cb5b8cee9f0469165cf24dc62c2.zip | |
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 df3f7a6e8e85 ("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: df3f7a6e8e85 ("iommu/amd: Use is_attach_deferred call-back")
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 4cd19f93ca15..121c54f1c768 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -310,6 +310,8 @@ static struct iommu_dev_data *find_dev_data(u16 devid) if (dev_data == NULL) { dev_data = alloc_dev_data(devid); + if (!dev_data) + return NULL; if (translation_pre_enabled(iommu)) dev_data->defer_attach = true; |