linux-stable.git/drivers/staging/android/ion, branch v4.2.4

staging: ion: fix corruption of ion_import_dma_buf

2015-10-22T21:49:22+00:00

commit 6fa92e2bcf6390e64895b12761e851c452d87bd8 upstream.

we found this issue but still exit in lastest kernel. Simply
keep ion_handle_create under mutex_lock to avoid this race.

WARNING: CPU: 2 PID: 2648 at drivers/staging/android/ion/ion.c:512 ion_handle_add+0xb4/0xc0()
ion_handle_add: buffer already found.
Modules linked in: iwlmvm iwlwifi mac80211 cfg80211 compat
CPU: 2 PID: 2648 Comm: TimedEventQueue Tainted: G        W    3.14.0 #7
 00000000 00000000 9a3efd2c 80faf273 9a3efd6c 9a3efd5c 80935dc9 811d7fd3
 9a3efd88 00000a58 812208a0 00000200 80e128d4 80e128d4 8d4ae00c a8cd8600
 a8cd8094 9a3efd74 80935e0e 00000009 9a3efd6c 811d7fd3 9a3efd88 9a3efd9c
Call Trace:
  [<80faf273>] dump_stack+0x48/0x69
  [<80935dc9>] warn_slowpath_common+0x79/0x90
  [<80e128d4>] ? ion_handle_add+0xb4/0xc0
  [<80e128d4>] ? ion_handle_add+0xb4/0xc0
  [<80935e0e>] warn_slowpath_fmt+0x2e/0x30
  [<80e128d4>] ion_handle_add+0xb4/0xc0
  [<80e144cc>] ion_import_dma_buf+0x8c/0x110
  [<80c517c4>] reg_init+0x364/0x7d0
  [<80993363>] ? futex_wait+0x123/0x210
  [<80992e0e>] ? get_futex_key+0x16e/0x1e0
  [<8099308f>] ? futex_wake+0x5f/0x120
  [<80c51e19>] vpu_service_ioctl+0x1e9/0x500
  [<80994aec>] ? do_futex+0xec/0x8e0
  [<80971080>] ? prepare_to_wait_event+0xc0/0xc0
  [<80c51c30>] ? reg_init+0x7d0/0x7d0
  [<80a22562>] do_vfs_ioctl+0x2d2/0x4c0
  [<80b198ad>] ? inode_has_perm.isra.41+0x2d/0x40
  [<80b199cf>] ? file_has_perm+0x7f/0x90
  [<80b1a5f7>] ? selinux_file_ioctl+0x47/0xf0
  [<80a227a8>] SyS_ioctl+0x58/0x80
  [<80fb45e8>] syscall_call+0x7/0x7
  [<80fb0000>] ? mmc_do_calc_max_discard+0xab/0xe4

Fixes: 83271f626 ("ion: hold reference to handle...")
Signed-off-by: Shawn Lin 
Reviewed-by: Laura Abbott 
Signed-off-by: Greg Kroah-Hartman

Staging:Android:ion - Fix for memory leak if ion device registration get failed.

2015-05-24T20:27:13+00:00

Fix to avoid possible memory leak if the ion device registration
get failed.Free the allocated device creation memory before return
in case the ion device registration get failed.

Signed-off-by: Shailendra Verma 
Signed-off-by: Greg Kroah-Hartman

drivers/staging: include for modular android tegra_ion code

2015-05-08T07:24:15+00:00

This file is built off of a tristate Kconfig option and also contains
modular function calls so it should explicitly include module.h to
avoid compile breakage during header shuffles done in the future.

Cc: Greg Kroah-Hartman 
Cc: "Arve Hj�nnev�g" 
Cc: Riley Andrews 
Cc: Stephen Warren 
Cc: Thierry Reding 
Cc: Alexandre Courbot 
Cc: devel@driverdev.osuosl.org
Cc: linux-tegra@vger.kernel.org
Signed-off-by: Paul Gortmaker 
Signed-off-by: Greg Kroah-Hartman

staging: android: ion_test: unregister the platform device

2015-05-08T07:24:08+00:00

The driver has to unregister from platform device when it's unloaded

Signed-off-by: Phong Tran 
Signed-off-by: Greg Kroah-Hartman

staging: android: ion_test: unregister the misc device

2015-05-08T07:24:08+00:00

Add the remove() method for deregister from misc device
when it's unloaded.

Signed-off-by: Phong Tran 
Signed-off-by: Greg Kroah-Hartman

staging: ion: chunk_heap: use pr_debug for heap creation print

2015-05-08T07:24:01+00:00

We're currently printing to the kernel log at `info' level when we
successfully create the chunk heap, but success messages should be done
at `debug' level.  Fix this.

Signed-off-by: Mitchel Humpherys 
Signed-off-by: Greg Kroah-Hartman

Staging: fixed multiple spelling errors.

2015-05-08T07:23:58+00:00

Fixed multiple spelling errors.

Signed-off-by: Carlos E. Garcia 
Signed-off-by: Greg Kroah-Hartman

staging: android: ion: fix wrong init of dma_buf_export_info

2015-04-21T09:17:16+00:00

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 
Reviewed-by: Dan Carpenter 
Acked-by: Greg Kroah-Hartman 
Signed-off-by: Sumit Semwal

dma-buf: cleanup dma_buf_export() to make it easily extensible

2015-04-21T09:17:16+00:00

At present, dma_buf_export() takes a series of parameters, which
makes it difficult to add any new parameters for exporters, if required.

Make it simpler by moving all these parameters into a struct, and pass
the struct * as parameter to dma_buf_export().

While at it, unite dma_buf_export_named() with dma_buf_export(), and
change all callers accordingly.

Reviewed-by: Maarten Lankhorst 
Reviewed-by: Daniel Thompson 
Acked-by: Mauro Carvalho Chehab 
Acked-by: Dave Airlie 
Signed-off-by: Sumit Semwal

staging: android: ion_test: Add the MODULE_LICENSE macro

2015-04-03T13:13:52+00:00

Base on the file comment should define GPL v2 for ion test driver

Signed-off-by: Phong Tran 
Signed-off-by: Greg Kroah-Hartman