On Wed, 11 May 2016, David Howells wrote:

diff --git a/Documentation/security/keys.txt b/Documentation/security/keys.txt
index ca72b70a24b9..01c2ae28a8c0 100644
--- a/Documentation/security/keys.txt
+++ b/Documentation/security/keys.txt
+     If the key needs to be unlocked with a password, a logon-type key that
+     holds the password may be given as the password argument
...
+     If the key must be unlocked with a password before it can be used,
+     password_id should point to a logon-type key that holds this.

It should be noted that the password_id should be 0 if no password is to be used.

diff --git a/security/keys/keyctl_pkey.c b/security/keys/keyctl_pkey.c
new file mode 100644
index 000000000000..7f51db984aaa
--- /dev/null
+++ b/security/keys/keyctl_pkey.c
+long keyctl_pkey_e_d_s(int op,
...
+       ret = params.key->type->asym_eds_op(&params, in, out);

Need to check for NULL asym_eds_op before calling.


Regards,

--
Mat Martineau
Intel OTC

--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to