Commit b64cc5fb authored Jul 26, 2014 by Mimi Zohar Committed by David Howells Jul 28, 2014

KEYS: revert encrypted key change



Commit fc7c70e0 "KEYS: struct key_preparsed_payload should have two
payload pointers" erroneously modified encrypted-keys.  This patch
reverts the change to that file.

Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: David Howells <dhowells@redhat.com>

parent f6fd5c84

security/keys/encrypted-keys/encrypted.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -811,7 +811,7 @@ static int encrypted_instantiate(struct key *key,
		goto out;
		}

		prep->payload[0] = epayload;
		rcu_assign_keypointer(key, epayload);
		out:
		kfree(datablob);
		return ret;