linux-toradex.git/crypto/asymmetric_keys, branch v3.18.18

KEYS: fix "ca_keys=" partial key matching

2015-07-04T03:02:18+00:00

[ Upstream commit f2b3dee484f9cee967a54ef05a66866282337519 ]

The call to asymmetric_key_hex_to_key_id() from ca_keys_setup()
silently fails with -ENOMEM.  Instead of dynamically allocating
memory from a __setup function, this patch defines a variable
and calls __asymmetric_key_hex_to_key_id(), a new helper function,
directly.

This bug was introduced by 'commit 46963b774d44 ("KEYS: Overhaul
key identification when searching for asymmetric keys")'.

Changelog:
- for clarification, rename hexlen to asciihexlen in
  asymmetric_key_hex_to_key_id()
- add size argument to __asymmetric_key_hex_to_key_id() - David Howells
- inline __asymmetric_key_hex_to_key_id() - David Howells
- remove duplicate strlen() calls

Acked-by: David Howells 
Signed-off-by: Mimi Zohar 
Cc: stable@vger.kernel.org # 3.18
Signed-off-by: Sasha Levin

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: output last portion of fingerprint in /proc/keys

2014-10-06T16:33:27+00:00

Previous version of KEYS used to output last 4 bytes of fingerprint.
Now it outputs 8 last bytes of raw subject, which does not make any
visual meaning at all. This patch restores old behavior.

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

KEYS: strip 'id:' from ca_keyid

2014-10-06T16:33:27+00:00

The 'id:' prefix must be stripped for asymmetric_key_hex_to_key_id() to be
able to process ca_keyid.

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

KEYS: use swapped SKID for performing partial matching

2014-10-06T15:56:08+00:00

Earlier KEYS code used pure subject key identifiers (fingerprint)
for searching keys. Latest merged code removed that and broke
compatibility with integrity subsytem signatures and original
format of module signatures.

This patch returns back partial matching on SKID.

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

KEYS: Restore partial ID matching functionality for asymmetric keys

2014-10-06T14:21:05+00:00

Bring back the functionality whereby an asymmetric key can be matched with a
partial match on one of its IDs.

Whilst we're at it, allow for the possibility of having an increased number of
IDs.

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

X.509: If available, use the raw subjKeyId to form the key description

2014-10-03T15:17:02+00:00

Module signing matches keys by comparing against the key description exactly.
However, the way the key description gets constructed got changed to be
composed of the subject name plus the certificate serial number instead of the
subject name and the subjectKeyId.  I changed this to avoid problems with
certificates that don't *have* a subjectKeyId.

Instead, if available, use the raw subjectKeyId to form the key description
and only use the serial number if the subjectKeyId doesn't exist.

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

KEYS: handle error code encoded in pointer

2014-10-03T12:41:51+00:00

If hexlen is odd then function returns an error.
Use IS_ERR to check for error, otherwise invalid pointer
is used and kernel gives oops:

[  132.816522] BUG: unable to handle kernel paging request at
ffffffffffffffea
[  132.819902] IP: [] asymmetric_key_id_same+0x14/0x36
[  132.820302] PGD 1a12067 PUD 1a14067 PMD 0
[  132.820302] Oops: 0000 [#1] SMP
[  132.820302] Modules linked in: bridge(E) stp(E) llc(E) evdev(E)
serio_raw(E) i2c_piix4(E) button(E) fuse(E)
[  132.820302] CPU: 0 PID: 2993 Comm: cat Tainted: G            E
3.16.0-kds+ #2847
[  132.820302] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
[  132.820302] task: ffff88004249a430 ti: ffff880056640000 task.ti:
ffff880056640000
[  132.820302] RIP: 0010:[]  []
asymmetric_key_id_same+0x14/0x36
[  132.820302] RSP: 0018:ffff880056643930  EFLAGS: 00010246
[  132.820302] RAX: 0000000000000000 RBX: ffffffffffffffea RCX:
ffff880056643ae0
[  132.820302] RDX: 000000000000005e RSI: ffffffffffffffea RDI:
ffff88005bac9300
[  132.820302] RBP: ffff880056643948 R08: 0000000000000003 R09:
00000007504aa01a
[  132.820302] R10: 0000000000000000 R11: 0000000000000000 R12:
ffff88005d68ca40
[  132.820302] R13: 0000000000000101 R14: 0000000000000000 R15:
ffff88005bac5280
[  132.820302] FS:  00007f67a153c740(0000) GS:ffff88005da00000(0000)
knlGS:0000000000000000
[  132.820302] CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
[  132.820302] CR2: ffffffffffffffea CR3: 000000002e663000 CR4:
00000000000006f0
[  132.820302] Stack:
[  132.820302]  ffffffff812bfc66 ffff880056643ae0 ffff88005bac5280
ffff880056643958
[  132.820302]  ffffffff812bfc9d ffff880056643980 ffffffff812971d9
ffff88005ce930c1
[  132.820302]  ffff88005ce930c0 0000000000000000 ffff8800566439c8
ffffffff812fb753
[  132.820302] Call Trace:
[  132.820302]  [] ? asymmetric_match_key_ids+0x24/0x42
[  132.820302]  [] asymmetric_key_cmp+0x19/0x1b
[  132.820302]  [] keyring_search_iterator+0x74/0xd7
[  132.820302]  [] assoc_array_subtree_iterate+0x67/0xd2
[  132.820302]  [] ? key_default_cmp+0x20/0x20
[  132.820302]  [] assoc_array_iterate+0x19/0x1e
[  132.820302]  [] search_nested_keyrings+0xf6/0x2b6
[  132.820302]  [] ? sched_clock_cpu+0x91/0xa2
[  132.820302]  [] ? mark_held_locks+0x58/0x6e
[  132.820302]  [] ? current_kernel_time+0x77/0xb8
[  132.820302]  [] keyring_search_aux+0xe1/0x14c
[  132.820302]  [] ? keyring_search_aux+0x6c/0x14c
[  132.820302]  [] keyring_search+0x8f/0xb6
[  132.820302]  [] ? asymmetric_match_key_ids+0x42/0x42
[  132.820302]  [] ? key_default_cmp+0x20/0x20
[  132.820302]  [] asymmetric_verify+0xa4/0x214
[  132.820302]  [] integrity_digsig_verify+0xb1/0xe2
[  132.820302]  [] ? evm_verifyxattr+0x6a/0x7a
[  132.820302]  [] ima_appraise_measurement+0x160/0x370
[  132.820302]  [] ? d_absolute_path+0x5b/0x7a
[  132.820302]  [] process_measurement+0x322/0x404

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

KEYS: Check hex2bin()'s return when generating an asymmetric key ID

2014-09-21T23:02:01+00:00

As it stands, the code to generate an asymmetric key ID prechecks the hex
string it is given whilst determining the length, before it allocates the
buffer for hex2bin() to translate into - which mean that checking the result of
hex2bin() is redundant.

Unfortunately, hex2bin() is marked as __must_check, which means that the
following warning may be generated if the return value isn't checked:

	crypto/asymmetric_keys/asymmetric_type.c: In function
	asymmetric_key_hex_to_key_id:
	crypto/asymmetric_keys/asymmetric_type.c:110: warning: ignoring return
	value of hex2bin, declared with attribute warn_unused_result

The warning can't be avoided by casting the result to void.

Instead, use strlen() to check the length of the string and ignore the fact
that the string might not be entirely valid hex until after the allocation has
been done - in which case we can use the result of hex2bin() for this.

Signed-off-by: David Howells

PKCS#7: Handle PKCS#7 messages that contain no X.509 certs

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

The X.509 certificate list in a PKCS#7 message is optional.  To save space, we
can omit the inclusion of any X.509 certificates if we are sure that we can
look the relevant public key up by the serial number and issuer given in a
signed info block.

This also supports use of a signed info block for which we can't find a
matching X.509 cert in the certificate list, though it be populated.

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