diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-15 07:17:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-15 07:17:40 +0200 |
| commit | 882ebfc28c389be86535bda4a7d9e407020356bf (patch) | |
| tree | e8f3ddeda13196f40040f3ba4701ece5d38c63cc /crypto/asymmetric_keys/public_key.c | |
| parent | mips/uapi: Add definition of TIOC[SG]RS485 (diff) | |
| parent | Linux 3.17-rc5 (diff) | |
| download | linux-882ebfc28c389be86535bda4a7d9e407020356bf.tar.xz linux-882ebfc28c389be86535bda4a7d9e407020356bf.zip | |
Merge 3.17-rc5 into tty-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto/asymmetric_keys/public_key.c')
| -rw-r--r-- | crypto/asymmetric_keys/public_key.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c index 97eb001960b9..2f6e4fb1a1ea 100644 --- a/crypto/asymmetric_keys/public_key.c +++ b/crypto/asymmetric_keys/public_key.c @@ -121,6 +121,7 @@ static int public_key_verify_signature_2(const struct key *key, struct asymmetric_key_subtype public_key_subtype = { .owner = THIS_MODULE, .name = "public_key", + .name_len = sizeof("public_key") - 1, .describe = public_key_describe, .destroy = public_key_destroy, .verify_signature = public_key_verify_signature_2, |