diff options
| author | Linus Torvalds <[email protected]> | 2016-10-28 16:23:59 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-10-28 16:23:59 +0000 |
| commit | 43937003de5b677781b2fe4c871d628ab00cc341 (patch) | |
| tree | 6c718e6d0cb910687da76fae415e3569862c121c /net/switchdev/switchdev.c | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | security/keys: make BIG_KEYS dependent on stdrng. (diff) | |
| download | kernel-43937003de5b677781b2fe4c871d628ab00cc341.tar.gz kernel-43937003de5b677781b2fe4c871d628ab00cc341.zip | |
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 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions