diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-05 07:48:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-05 07:48:50 -0700 |
| commit | cae1d2cab43bb34c242f272da499bf5f25d778c7 (patch) | |
| tree | 81ed56a81f101c893f5ea2121016520348cfa5f3 /crypto/shash.c | |
| parent | 2145e15e0557a01b9195d1c7199a1b92cb9be81f (diff) | |
| parent | bebfef150e0b8fa68704cddacf05b8c26462d565 (diff) | |
Merge tag 'upstream-3.15-rc5' of git://git.infradead.org/linux-ubifs
Pull ubifs fixes from Artem Bityutskiy:
"This includes the following fixes:
- two real bug-fixes from Tanya for the still "experimental" UBI
fastmap feature
- a one-liner from Kees which hardens kernel security
- a small error-path fix, where we forget to free various resources
in case of failure - spotted by the 'smatch' tool"
* tag 'upstream-3.15-rc5' of git://git.infradead.org/linux-ubifs:
UBI: avoid workqueue format string leak
UBI: fix ubi free PEBs count calculation
UBI: fix error path in __wl_get_peb
UBIFS: fix remount error path
Diffstat (limited to 'crypto/shash.c')
0 files changed, 0 insertions, 0 deletions