Skip to content

Commit

Permalink
KEYS: revert encrypted key change
Browse files Browse the repository at this point in the history
Commit fc7c70e "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>
  • Loading branch information
Mimi Zohar authored and David Howells committed Jul 28, 2014
1 parent f6fd5c8 commit b64cc5f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion security/keys/encrypted-keys/encrypted.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b64cc5f

Please sign in to comment.