James Morris d2e7ad1922 Merge branch 'master' into next ...

Conflicts:
	security/smack/smack_lsm.c

Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>

Signed-off-by: James Morris <jmorris@namei.org>

2011-01-10 09:46:24 +11:00

..

compat.c

KEYS: Add a keyctl to install a process's session keyring on its parent [try #6]

2009-09-02 21:29:22 +10:00

encrypted_defined.c

encrypted-keys: style and other cleanup

2010-12-15 12:14:34 +05:30

encrypted_defined.h

encrypted-keys: style and other cleanup

2010-12-15 12:14:34 +05:30

gc.c

KEYS: Fix RCU handling in key_gc_keyring()

2010-05-05 11:39:23 +10:00

internal.h

Add a dummy printk function for the maintenance of unused printks

2010-08-12 09:51:35 -07:00

key.c

KEYS: Do preallocation for __key_link()

2010-05-06 22:25:02 +10:00

keyctl.c

KEYS: Fix bug in keyctl_session_to_parent() if parent has no session keyring

2010-09-10 07:30:00 -07:00

keyring.c

kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN

2010-05-25 08:07:02 -07:00

Makefile

keys: add new key-type encrypted

2010-11-29 08:55:29 +11:00

permission.c

security: whitespace coding style fixes

2010-04-23 10:10:23 +10:00

proc.c

KEYS: Make /proc/keys check to see if a key is possessed before security check

2010-08-02 15:34:27 +10:00

process_keys.c

Fix install_process_keyring error handling

2010-10-28 09:02:15 -07:00

request_key_auth.c

CRED: Inaugurate COW credentials

2008-11-14 10:39:23 +11:00

request_key.c

KEYS: Don't call up_write() if __key_link_begin() returns an error

2010-12-23 15:31:48 -08:00

sysctl.c

sysctl: Drop & in front of every proc_handler.

2009-11-18 08:37:40 -08:00

trusted_defined.c

trusted-keys: kzalloc and other cleanup

2010-12-15 12:14:27 +05:30

trusted_defined.h

keys: add new trusted key-type

2010-11-29 08:55:25 +11:00

user_defined.c

KEYS: Fix an RCU warning in the reading of user keys

2010-05-05 11:38:52 +10:00