/[linux-patches]/genpatches-2.6/trunk/2.6.16/1002_linux-2.6.16.3.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.16/1002_linux-2.6.16.3.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 369 - (show annotations) (download) (as text)
Tue Apr 11 11:37:55 2006 UTC (14 years, 7 months ago) by dsd
File MIME type: text/x-diff
File size: 866 byte(s)
Linux 2.6.16.3
1 diff --git a/security/keys/key.c b/security/keys/key.c
2 index 99781b7..0e2584e 100644
3 --- a/security/keys/key.c
4 +++ b/security/keys/key.c
5 @@ -785,6 +785,10 @@ key_ref_t key_create_or_update(key_ref_t
6
7 key_check(keyring);
8
9 + key_ref = ERR_PTR(-ENOTDIR);
10 + if (keyring->type != &key_type_keyring)
11 + goto error_2;
12 +
13 down_write(&keyring->sem);
14
15 /* if we're going to allocate a new key, we're going to have
16 diff --git a/security/keys/keyring.c b/security/keys/keyring.c
17 index d65a180..bffa924 100644
18 --- a/security/keys/keyring.c
19 +++ b/security/keys/keyring.c
20 @@ -437,6 +437,7 @@ EXPORT_SYMBOL(keyring_search);
21 /*
22 * search the given keyring only (no recursion)
23 * - keyring must be locked by caller
24 + * - caller must guarantee that the keyring is a keyring
25 */
26 key_ref_t __keyring_search_one(key_ref_t keyring_ref,
27 const struct key_type *ktype,

  ViewVC Help
Powered by ViewVC 1.1.20