diff options
author | Joonyoung Shim <jy0922.shim@samsung.com> | 2013-07-04 03:19:12 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-07-05 01:36:20 -0400 |
commit | f9d8a1294d37449f3f1b842ffb275e2ca41f5cf4 (patch) | |
tree | 015b94316caaf63df9278dba5695eb49f773ac77 | |
parent | 63eef6002bd2c719bf10dc436fc0dd8c6baef69a (diff) |
drm/prime: fix sgt NULL checking
The drm_gem_map_detach() can be called with sgt is NULL.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/drm_prime.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 1e0de41f085c..ff5fecef367b 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c | |||
@@ -119,12 +119,13 @@ static void drm_gem_map_detach(struct dma_buf *dma_buf, | |||
119 | return; | 119 | return; |
120 | 120 | ||
121 | sgt = prime_attach->sgt; | 121 | sgt = prime_attach->sgt; |
122 | if (sgt) { | ||
123 | if (prime_attach->dir != DMA_NONE) | ||
124 | dma_unmap_sg(attach->dev, sgt->sgl, sgt->nents, | ||
125 | prime_attach->dir); | ||
126 | sg_free_table(sgt); | ||
127 | } | ||
122 | 128 | ||
123 | if (prime_attach->dir != DMA_NONE) | ||
124 | dma_unmap_sg(attach->dev, sgt->sgl, sgt->nents, | ||
125 | prime_attach->dir); | ||
126 | |||
127 | sg_free_table(sgt); | ||
128 | kfree(sgt); | 129 | kfree(sgt); |
129 | kfree(prime_attach); | 130 | kfree(prime_attach); |
130 | attach->priv = NULL; | 131 | attach->priv = NULL; |