Commit graph

401392 commits

Author SHA1 Message Date
Linus Torvalds
88829dfe4b Two important fixes
- Fix long standing memory leak in the (rarely used) public key support
 - Fix large file corruption on 32 bit architectures
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABCgAGBQJSaX/HAAoJENaSAD2qAscKdpQQAI6Rvsv5y/Gj+8/9rCUnNYhw
 8YWYkOko2+cyGl6ro+nIm2nmKOuaGrjijvubOjOAe4WkMzS0EyJjku/9NT3S6KzC
 SqHC0ZeZf0jaFC9zUkUN69RY9m96Ak94HAagXO3Qm39DCSj8xijxODOVnVzkEs2x
 ylOU8OgRbD/AIDzmLxgHaOtuAmQ0GNvbVoYK6ZErVmOMENU2/67iH3OsyGD4OFpr
 Oaq1i8m7rxPmwv3QNSGhXSK6EScqs2jgM4aPWx3aG+OhYv6sGWkL8jJgPS/uSUBc
 ttD1Ou/d9yyvZPDFd9wmiHhenbCVbEdl6JAIS8zKv4NkSQ3V7AVWwAoe6JMfbREo
 U+Om7FwGLgKlZ/19+IxBMGTITuOjUkKq97vJMiYbXuWzdrZSflv5GiGGKbxchmnA
 CnfYaN1HYVcpLsbXoDTBomML7VTtbifgmY0diUJ2aJ1eTg86Gs1DXjhnuLF70Jjd
 dfuYfOKkJguuRfZ50yrpWfEQ0iOudXI1v+PrramLof33lNKWI8XeKjgDxyUrAjOZ
 UjFT639EXIRzYDIOCPZicQKdNO3BRziKi1cSnXQQp9cNTMs6/FIxK2zrQmjgqvww
 Hwj+M6czLs45lbfjQIxi3FlEAYYdXBQwrEiAu4cmt9j1bxIZnwIa7Fu0bXSxphfD
 dUo0GN7CkF45BkNvotFX
 =74EV
 -----END PGP SIGNATURE-----

Merge tag 'ecryptfs-3.12-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs

Pull ecryptfs fixes from Tyler Hicks:
 "Two important fixes
   - Fix long standing memory leak in the (rarely used) public key
     support
   - Fix large file corruption on 32 bit architectures"

* tag 'ecryptfs-3.12-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  eCryptfs: fix 32 bit corruption issue
  ecryptfs: Fix memory leakage in keystore.c
2013-10-25 07:32:01 +01:00
Russ Dill
d3c345dbc7 PM / hibernate: Move software_resume to late_initcall_sync
software_resume is being called after deferred_probe_initcall in
drivers base. If the probing of the device that contains the resume
image is deferred, and the system has been instructed to wait for
it to show up, this wait will occur in software_resume. This causes
a deadlock.

Move software_resume into late_initcall_sync so that it happens
after all the other late_initcalls.

Signed-off-by: Russ Dill <Russ.Dill@ti.com>
Acked-by: Pavel Machek <Pavel@ucw.cz>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2013-10-25 01:58:49 +02:00
Ezequiel Garcia
18a84e935e mtd: nand: pxa3xx: Fix registered MTD name
In a recent commit:

  commit f455578dd9
  Author: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
  Date:   Mon Aug 12 14:14:53 2013 -0300

  mtd: nand: pxa3xx: Remove hardcoded mtd name

  There's no advantage in using a hardcoded name for the mtd device.
  Instead use the provided by the platform_device.

The MTD name was changed to use the one provided by the platform_device.
However, this can be problematic as some users want to set partitions
using the kernel parameter 'mtdparts', where the name is needed.

Therefore, to avoid regressions in users relying in 'mtdparts' we revert
the change and use the previous one 'pxa3xx_nand-0'.

While at it, let's put a big comment and prevent this change from happening
ever again.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
2013-10-24 14:44:28 -07:00
Colin Ian King
43b7c6c6a4 eCryptfs: fix 32 bit corruption issue
Shifting page->index on 32 bit systems was overflowing, causing
data corruption of > 4GB files. Fix this by casting it first.

https://launchpad.net/bugs/1243636

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reported-by: Lars Duesing <lars.duesing@camelotsweb.de>
Cc: stable@vger.kernel.org # v3.11+
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
2013-10-24 12:36:30 -07:00
Vinod Koul
7261828776 dmaengine: edma: fix another memory leak
commit 4b6271a6 fix a menory leak but one more existed in driver so fix that

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
2013-10-24 22:17:50 +05:30
Valentin Ilie
4b6271a644 dma: edma: Fix memory leak
When it fails to allocate a slot, edesc should be free'd before return;

Signed-off-by: Valentin Ilie <valentin.ilie@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
2013-10-24 22:16:15 +05:30
Denis Carikli
154bab12e1 ASoC: eukrea-tlv320: Use dev_err instead of pr_err.
It also contains a minor style cleanup.

Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-10-24 13:22:30 +01:00
Mark Brown
9645083ca5 Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next 2013-10-24 11:24:18 +01:00
Mark Brown
cd77607f57 Merge remote-tracking branch 'asoc/topic/wm8400' into asoc-next 2013-10-24 11:24:18 +01:00
Mark Brown
d12649452d Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next 2013-10-24 11:24:17 +01:00
Mark Brown
e3a4bd276d Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next 2013-10-24 11:24:17 +01:00
Mark Brown
856de81583 Merge remote-tracking branch 'asoc/topic/tpa6130a2' into asoc-next 2013-10-24 11:24:17 +01:00
Mark Brown
3caa28274e Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next 2013-10-24 11:24:16 +01:00
Mark Brown
24a6703abb Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-next 2013-10-24 11:24:16 +01:00
Mark Brown
3cabd442d7 Merge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-next 2013-10-24 11:24:15 +01:00
Mark Brown
2b48f86b5b Merge remote-tracking branch 'asoc/topic/tlv320aic23' into asoc-next 2013-10-24 11:24:15 +01:00
Mark Brown
a5f0ac4a0b Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next 2013-10-24 11:24:14 +01:00
Mark Brown
7524be376d Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-next 2013-10-24 11:24:14 +01:00
Mark Brown
abdd182e93 Merge remote-tracking branch 'asoc/topic/spear' into asoc-next 2013-10-24 11:24:13 +01:00
Mark Brown
c5833ddc4a Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-next 2013-10-24 11:24:13 +01:00
Mark Brown
ccc6d1922e Merge remote-tracking branch 'asoc/topic/simple' into asoc-next 2013-10-24 11:24:12 +01:00
Mark Brown
f6b967ab1b Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next 2013-10-24 11:24:12 +01:00
Mark Brown
1f7f8e0462 Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next 2013-10-24 11:24:12 +01:00
Mark Brown
a6f849f752 Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next 2013-10-24 11:24:11 +01:00
Mark Brown
5b2ad46d6e Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next 2013-10-24 11:24:11 +01:00
Mark Brown
c0840b2728 Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next 2013-10-24 11:24:10 +01:00
Mark Brown
8018abf63d Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next 2013-10-24 11:24:10 +01:00
Mark Brown
440f5e8996 Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next 2013-10-24 11:24:09 +01:00
Mark Brown
10abe843d5 Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next 2013-10-24 11:24:09 +01:00
Mark Brown
07797e9bb6 Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-next 2013-10-24 11:24:08 +01:00
Mark Brown
ed87aabf60 Merge remote-tracking branch 'asoc/topic/max9850' into asoc-next 2013-10-24 11:24:08 +01:00
Mark Brown
4131770d54 Merge remote-tracking branch 'asoc/topic/max98095' into asoc-next 2013-10-24 11:24:07 +01:00
Mark Brown
1a4ca437e4 Merge remote-tracking branch 'asoc/topic/max98088' into asoc-next 2013-10-24 11:24:07 +01:00
Mark Brown
2e71ff5e8a Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next 2013-10-24 11:24:06 +01:00
Mark Brown
8ff9f38bda Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next 2013-10-24 11:24:06 +01:00
Mark Brown
54128df2ba Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-next 2013-10-24 11:24:06 +01:00
Mark Brown
9f7a949fb9 Merge remote-tracking branch 'asoc/topic/doc' into asoc-next 2013-10-24 11:24:05 +01:00
Mark Brown
70e0db2f74 Merge remote-tracking branch 'asoc/topic/dma' into asoc-next 2013-10-24 11:24:05 +01:00
Mark Brown
48ce3ec16a Merge remote-tracking branch 'asoc/topic/devm' into asoc-next 2013-10-24 11:24:04 +01:00
Mark Brown
cf44fba089 Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next 2013-10-24 11:24:04 +01:00
Mark Brown
0705690110 Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next 2013-10-24 11:24:03 +01:00
Mark Brown
85eb5dce82 Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-next 2013-10-24 11:24:03 +01:00
Mark Brown
05be686a40 Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next 2013-10-24 11:24:02 +01:00
Mark Brown
f8736ad2ee Merge remote-tracking branch 'asoc/topic/cq93vc' into asoc-next 2013-10-24 11:24:02 +01:00
Mark Brown
d6ee232c7f Merge remote-tracking branch 'asoc/topic/core' into asoc-next 2013-10-24 11:24:02 +01:00
Mark Brown
6180561670 Merge remote-tracking branch 'asoc/topic/component' into asoc-next 2013-10-24 11:24:01 +01:00
Mark Brown
d1c59c8712 Merge remote-tracking branch 'asoc/topic/bclk' into asoc-next 2013-10-24 11:24:01 +01:00
Mark Brown
80ca31869f Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next 2013-10-24 11:24:00 +01:00
Mark Brown
c4c2361aef Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next 2013-10-24 11:24:00 +01:00
Mark Brown
805c605562 Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-next 2013-10-24 11:23:59 +01:00