diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 16:54:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 16:54:43 -0400 |
| commit | a890b15c0990cc8d686edcc85f5fccde71ad5ce9 (patch) | |
| tree | 73162355b58283a2531f13fbbf663809f95c1483 /security/keys/key.c | |
| parent | 79fa1b677be3a985cc66b9218a4dd09818f1051b (diff) | |
| parent | 26ec634c31a11a003040e10b4d650495158632fd (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'security/keys/key.c')
| -rw-r--r-- | security/keys/key.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/security/keys/key.c b/security/keys/key.c index a057e3311aad..b6061fa29da7 100644 --- a/security/keys/key.c +++ b/security/keys/key.c | |||
| @@ -785,6 +785,10 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref, | |||
| 785 | 785 | ||
| 786 | key_check(keyring); | 786 | key_check(keyring); |
| 787 | 787 | ||
| 788 | key_ref = ERR_PTR(-ENOTDIR); | ||
| 789 | if (keyring->type != &key_type_keyring) | ||
| 790 | goto error_2; | ||
| 791 | |||
| 788 | down_write(&keyring->sem); | 792 | down_write(&keyring->sem); |
| 789 | 793 | ||
| 790 | /* if we're going to allocate a new key, we're going to have | 794 | /* if we're going to allocate a new key, we're going to have |