David Howells fe9453a1dc KEYS: Revert one application of "Fix unreachable code" patch ... A patch to fix some unreachable code in search_my_process_keyrings() got applied twice by two different routes upstream as commits e67eab39be and b010520ab3 (both "fix unreachable code"). Unfortunately, the second application removed something it shouldn't have and this wasn't detected by GIT. This is due to the patch not having sufficient lines of context to distinguish the two places of application. The effect of this is relatively minor: inside the kernel, the keyring search routines may search multiple keyrings and then prioritise the errors if no keys or negative keys are found in any of them. With the extra deletion, the presence of a negative key in the thread keyring (causing ENOKEY) is incorrectly overridden by an error searching the process keyring. So revert the second application of the patch. Signed-off-by: David Howells <dhowells@redhat.com> Cc: Jiri Kosina <jkosina@suse.cz> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: stable@vger.kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2013-02-21 07:56:25 -08:00
..
apparmor	apparmor: fix IRQ stack overflow during free_profile	2012-10-25 02:12:50 +11:00
integrity	evm: checking if removexattr is not a NULL	2013-01-22 00:27:50 +11:00
keys	KEYS: Revert one application of "Fix unreachable code" patch	2013-02-21 07:56:25 -08:00
selinux	tun: fix LSM/SELinux labeling of tun/tap devices	2013-01-14 18:16:59 -05:00
smack	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-12-16 15:40:50 -08:00
tomoyo	consitify do_mount() arguments	2012-10-11 20:02:04 -04:00
yama	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2012-12-17 15:44:47 -08:00
capability.c	tun: fix LSM/SELinux labeling of tun/tap devices	2013-01-14 18:16:59 -05:00
commoncap.c	Fix cap_capable to only allow owners in the parent user namespace to have caps.	2012-12-14 13:50:32 -08:00
device_cgroup.c	security/device_cgroup: lock assert fails in dev_exception_clean()	2013-01-22 00:27:55 +11:00
inode.c	securityfs: fix object creation races	2012-01-10 10:20:35 -05:00
Kconfig	KEYS: Move the key config into security/keys/Kconfig	2012-05-11 10:56:56 +01:00
lsm_audit.c	LSM: BUILD_BUG_ON if the common_audit_data union ever grows	2012-04-09 12:23:03 -04:00
Makefile	security: Yama LSM	2012-02-10 09:18:52 +11:00
min_addr.c	mmap_min_addr check CAP_SYS_RAWIO only for write	2010-04-23 08:56:31 +10:00
security.c	tun: fix LSM/SELinux labeling of tun/tap devices	2013-01-14 18:16:59 -05:00