linux.git/security/keys/key.c, branch v3.19

KEYS: remove a bogus NULL check

2014-12-16T07:05:20+00:00

We already checked if "desc" was NULL at the beginning of the function
and we've dereferenced it so this causes a static checker warning.

Signed-off-by: Dan Carpenter 
Signed-off-by: David Howells 
Signed-off-by: James Morris

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2014-10-12T14:13:55+00:00

Pull security subsystem updates from James Morris.

Mostly ima, selinux, smack and key handling updates.

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (65 commits)
  integrity: do zero padding of the key id
  KEYS: output last portion of fingerprint in /proc/keys
  KEYS: strip 'id:' from ca_keyid
  KEYS: use swapped SKID for performing partial matching
  KEYS: Restore partial ID matching functionality for asymmetric keys
  X.509: If available, use the raw subjKeyId to form the key description
  KEYS: handle error code encoded in pointer
  selinux: normalize audit log formatting
  selinux: cleanup error reporting in selinux_nlmsg_perm()
  KEYS: Check hex2bin()'s return when generating an asymmetric key ID
  ima: detect violations for mmaped files
  ima: fix race condition on ima_rdwr_violation_check and process_measurement
  ima: added ima_policy_flag variable
  ima: return an error code from ima_add_boot_aggregate()
  ima: provide 'ima_appraise=log' kernel option
  ima: move keyring initialization to ima_init()
  PKCS#7: Handle PKCS#7 messages that contain no X.509 certs
  PKCS#7: Better handling of unsupported crypto
  KEYS: Overhaul key identification when searching for asymmetric keys
  KEYS: Implement binary asymmetric key ID handling
  ...

KEYS: Remove key_type::match in favour of overriding default by match_preparse

2014-09-16T16:36:06+00:00

A previous patch added a ->match_preparse() method to the key type.  This is
allowed to override the function called by the iteration algorithm.
Therefore, we can just set a default that simply checks for an exact match of
the key description with the original criterion data and allow match_preparse
to override it as needed.

The key_type::match op is then redundant and can be removed, as can the
user_match() function.

Signed-off-by: David Howells 
Acked-by: Vivek Goyal

KEYS: Increase root_maxkeys and root_maxbytes sizes

2014-09-03T00:27:12+00:00

Now that NFS client uses the kernel key ring facility to store the NFSv4
id/gid mappings, the defaults for root_maxkeys and root_maxbytes need to be
substantially increased.

These values have been soak tested:

	https://bugzilla.redhat.com/show_bug.cgi?id=1033708#c73

Signed-off-by: Steve Dickson 
Signed-off-by: David Howells 
Signed-off-by: James Morris

KEYS: Call ->free_preparse() even after ->preparse() returns an error

2014-07-22T20:46:12+00:00

Call the ->free_preparse() key type op even after ->preparse() returns an
error as it does cleaning up type stuff.

Signed-off-by: David Howells 
Acked-by: Steve Dickson 
Acked-by: Jeff Layton 
Reviewed-by: Sage Weil

KEYS: Allow expiry time to be set when preparsing a key

2014-07-22T20:46:08+00:00

Allow a key type's preparsing routine to set the expiry time for a key.

Signed-off-by: David Howells 
Acked-by: Steve Dickson 
Acked-by: Jeff Layton 
Reviewed-by: Sage Weil

KEYS: struct key_preparsed_payload should have two payload pointers

2014-07-22T20:46:02+00:00

struct key_preparsed_payload should have two payload pointers to correspond
with those in struct key.

Signed-off-by: David Howells 
Acked-by: Steve Dickson 
Acked-by: Jeff Layton 
Reviewed-by: Sage Weil

KEYS: Provide a generic instantiation function

2014-07-18T17:56:34+00:00

Provide a generic instantiation function for key types that use the preparse
hook.  This makes it easier to prereserve key quota before keyrings get locked
to retain the new key.

Signed-off-by: David Howells 
Acked-by: Steve Dickson 
Acked-by: Jeff Layton 
Reviewed-by: Sage Weil

KEYS: Move the flags representing required permission to linux/key.h

2014-03-14T17:44:49+00:00

Move the flags representing required permission to linux/key.h as the perm
parameter of security_key_permission() is in terms of them - and not the
permissions mask flags used in key->perm.

Whilst we're at it:

 (1) Rename them to be KEY_NEED_xxx rather than KEY_xxx to avoid collisions
     with symbols in uapi/linux/input.h.

 (2) Don't use key_perm_t for a mask of required permissions, but rather limit
     it to the permissions mask attached to the key and arguments related
     directly to that.

Signed-off-by: David Howells 
Tested-by: Dmitry Kasatkin

KEYS: Pre-clear struct key on allocation

2013-12-02T11:24:18+00:00

The second word of key->payload does not get initialised in key_alloc(), but
the big_key type is relying on it having been cleared.  The problem comes when
big_key fails to instantiate a large key and doesn't then set the payload.  The
big_key_destroy() op is called from the garbage collector and this assumes that
the dentry pointer stored in the second word will be NULL if instantiation did
not complete.

Therefore just pre-clear the entire struct key on allocation rather than trying
to be clever and only initialising to 0 only those bits that aren't otherwise
initialised.

The lack of initialisation can lead to a bug report like the following if
big_key failed to initialise its file:

	general protection fault: 0000 [#1] SMP
	Modules linked in: ...
	CPU: 0 PID: 51 Comm: kworker/0:1 Not tainted 3.10.0-53.el7.x86_64 #1
	Hardware name: Dell Inc. PowerEdge 1955/0HC513, BIOS 1.4.4 12/09/2008
	Workqueue: events key_garbage_collector
	task: ffff8801294f5680 ti: ffff8801296e2000 task.ti: ffff8801296e2000
	RIP: 0010:[] dput+0x21/0x2d0
	...
	Call Trace:
	 [] path_put+0x16/0x30
	 [] big_key_destroy+0x44/0x60
	 [] key_gc_unused_keys.constprop.2+0x5b/0xe0
	 [] key_garbage_collector+0x1df/0x3c0
	 [] process_one_work+0x17b/0x460
	 [] worker_thread+0x11b/0x400
	 [] ? rescuer_thread+0x3e0/0x3e0
	 [] kthread+0xc0/0xd0
	 [] ? kthread_create_on_node+0x110/0x110
	 [] ret_from_fork+0x7c/0xb0
	 [] ? kthread_create_on_node+0x110/0x110

Reported-by: Patrik Kis 
Signed-off-by: David Howells 
Reviewed-by: Stephen Gallagher