diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2015-02-21 09:00:17 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2015-04-21 14:47:16 +0530 |
| commit | 72449cb47b0104c32ff8fb9380ade9113375d8d1 (patch) | |
| tree | f3cf60315d9b4a994e62c86ac4c9db44daaa85a0 /drivers | |
| parent | d8fbe341beb617ebb22b98fb893e4aa32ae2d864 (diff) | |
| download | linux-72449cb47b0104c32ff8fb9380ade9113375d8d1.tar.bz2 | |
staging: android: ion: fix wrong init of dma_buf_export_info
Fixes: 817bd7253291 ("dma-buf: cleanup dma_buf_export() to make it
easily extensible")
Stupid copy-paste from me in the above patch leads to the following static
checker warning:
drivers/staging/android/ion/ion.c:1112 ion_share_dma_buf()
error: potentially dereferencing uninitialized 'buffer'.
drivers/staging/android/ion/ion.c
1103 struct dma_buf *ion_share_dma_buf(struct ion_client *client,
1104 struct
ion_handle *handle)
1105 {
1106 struct ion_buffer *buffer;
^^^^^^
1107 struct dma_buf *dmabuf;
1108 bool valid_handle;
1109 DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
1110
1111 exp_info.ops = &dma_buf_ops;
1112 exp_info.size = buffer->size;
^^^^^^
1113 exp_info.flags = O_RDWR;
1114 exp_info.priv = buffer;
^^^^^^
And here also.
1115
This patch corrects this stupidity.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/android/ion/ion.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index b94d69feff46..b0b96ab31954 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -1108,11 +1108,6 @@ struct dma_buf *ion_share_dma_buf(struct ion_client *client, bool valid_handle; DEFINE_DMA_BUF_EXPORT_INFO(exp_info); - exp_info.ops = &dma_buf_ops; - exp_info.size = buffer->size; - exp_info.flags = O_RDWR; - exp_info.priv = buffer; - mutex_lock(&client->lock); valid_handle = ion_handle_validate(client, handle); if (!valid_handle) { @@ -1124,6 +1119,11 @@ struct dma_buf *ion_share_dma_buf(struct ion_client *client, ion_buffer_get(buffer); mutex_unlock(&client->lock); + exp_info.ops = &dma_buf_ops; + exp_info.size = buffer->size; + exp_info.flags = O_RDWR; + exp_info.priv = buffer; + dmabuf = dma_buf_export(&exp_info); if (IS_ERR(dmabuf)) { ion_buffer_put(buffer); |