linux-stable.git/drivers/staging/vt6655, branch v3.5

Merge 3.4-rc5 into staging-next

2012-05-02T18:48:07+00:00

This resolves the conflict in:
	drivers/staging/vt6656/ioctl.c

Signed-off-by: Greg Kroah-Hartman

staging: replace open-coded ARRAY_SIZEs

2012-04-10T22:25:55+00:00

spatch http://coccinelle.lip6.fr/rules/array.cocci did these.

Signed-off-by: Jim Cromie 
Signed-off-by: Greg Kroah-Hartman

Staging: vt6655-6: check keysize before memcpy()

2012-04-10T16:17:34+00:00

We need to check the we don't copy too much memory.  This comes from a
copy_from_user() in the ioctl.

Signed-off-by: Dan Carpenter 
Signed-off-by: Greg Kroah-Hartman

staging: Fix typo in bssdb.c

2012-02-24T20:05:37+00:00

Correct spelling "scaning" to "scanning" in
drivers/staging/vt6656/bssdb.c
drivers/staging/vt6655/bssdb.c

Signed-off-by: Masanari Iida 
Signed-off-by: Greg Kroah-Hartman

Staging: vt6655: Fix brace coding style issues in ioctl.c

2012-02-09T17:19:21+00:00

This patch fixes up unnecessary brace warnings found in ioctl.c
by checkpatch.pl .

Signed-off-by: Mahendra Singh Meena 
Signed-off-by: Greg Kroah-Hartman

staging: vt6655: integer overflows in private_ioctl()

2011-11-30T10:29:40+00:00

There are two potential integer overflows in private_ioctl() if
userspace passes in a large sList.uItem / sNodeList.uItem.  The
subsequent call to kmalloc() would allocate a small buffer, leading
to a memory corruption.

Reported-by: Dan Rosenberg 
Signed-off-by: Xi Wang 
Signed-off-by: Greg Kroah-Hartman

staging:vt6656: iwctl.c: Removed unneeded function

2011-11-30T10:25:50+00:00

Removed the function iwctl_giwnwid, that just return a error code.

Changes v1 to v2:
	Removed same functions of vt6655 and vt6656.

Signed-off-by: Marcos Paulo de Souza 
Signed-off-by: Greg Kroah-Hartman

Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2011-10-26T13:39:02+00:00

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)
  staging: et131x: Remove redundant check and return statement
  staging: et131x: Mainly whitespace changes to appease checkpatch
  staging: et131x: Remove last of the forward declarations
  staging: et131x: Remove even more forward declarations
  staging: et131x: Remove yet more forward declarations
  staging: et131x: Remove more forward declarations
  staging: et131x: Remove forward declaration of et131x_adapter_setup
  staging: et131x: Remove some forward declarations
  staging: et131x: Remove unused rx_ring.recv_packet_pool
  staging: et131x: Remove call to find pci pm capability
  staging: et131x: Remove redundant et131x_reset_recv() call
  staging: et131x: Remove unused rx_ring.recv_buffer_pool
  Staging: bcm: Fix three initialization errors in InterfaceDld.c
  Staging: bcm: Fix coding style issues in InterfaceDld.c
  staging:iio:dac: Add AD5360 driver
  staging:iio:trigger:bfin-timer: Fix compile error
  Staging: vt6655: add some range checks before memcpy()
  Staging: vt6655: whitespace fixes to iotcl.c
  Staging: vt6656: add some range checks before memcpy()
  Staging: vt6656: whitespace cleanups in ioctl.c
  ...

Fix up conflicts in:
 - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:
	vg driver movement
 - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:
	driver removal vs now stale changes
 - drivers/staging/rtl8192e/r8192E_core.c:
	driver removal vs now stale changes
 - drivers/staging/et131x/et131*:
	driver consolidation into one file, tried to do fixups

Staging: vt6655: add some range checks before memcpy()

2011-10-23T08:13:20+00:00

There were no range checks in the original code so the user could
write past the end of the array.

Signed-off-by: Dan Carpenter 
Signed-off-by: Greg Kroah-Hartman

Staging: vt6655: whitespace fixes to iotcl.c

2011-10-23T08:13:20+00:00

The indents didn't line up at all in the original code.  I also fixed
a bunch of other white issues as I went along.  I changed the comment
style and removed some commented out code.

Signed-off-by: Dan Carpenter 
Signed-off-by: Greg Kroah-Hartman