diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-28 09:23:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-28 09:23:59 -0700 |
| commit | 43937003de5b677781b2fe4c871d628ab00cc341 (patch) | |
| tree | 6c718e6d0cb910687da76fae415e3569862c121c /block/blk-timeout.c | |
| parent | 14970f204b1993af7459d5bd34aaff38dfee6670 (diff) | |
| parent | 31e6ec4519c0fe0ee4a2f6ba3ab278e9506b9500 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull key fixes from James Morris:
- fix a buffer overflow when displaying /proc/keys [CVE-2016-7042].
- fix broken initialisation in the big_key implementation that can
result in an oops.
- make big_key depend on having a random number generator available in
Kconfig.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
security/keys: make BIG_KEYS dependent on stdrng.
KEYS: Sort out big_key initialisation
KEYS: Fix short sprintf buffer in /proc/keys show function
Diffstat (limited to 'block/blk-timeout.c')
0 files changed, 0 insertions, 0 deletions