diff options
| author | David Howells <dhowells@redhat.com> | 2012-10-02 19:24:56 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-10-02 19:24:56 +0100 |
| commit | f8aa23a55f813c9bddec2a6176e0e67274e6e7c1 (patch) | |
| tree | 1b1927cedb4f1d769fac19242f3a365c84e40cec /net/dns_resolver | |
| parent | 96b5c8fea6c0861621051290d705ec2e971963f1 (diff) | |
| download | linux-3.10-f8aa23a55f813c9bddec2a6176e0e67274e6e7c1.tar.gz linux-3.10-f8aa23a55f813c9bddec2a6176e0e67274e6e7c1.tar.bz2 linux-3.10-f8aa23a55f813c9bddec2a6176e0e67274e6e7c1.zip | |
KEYS: Use keyring_alloc() to create special keyrings
Use keyring_alloc() to create special keyrings now that it has a permissions
parameter rather than using key_alloc() + key_instantiate_and_link().
Also document and export keyring_alloc() so that modules can use it too.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/dns_resolver')
| -rw-r--r-- | net/dns_resolver/dns_key.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c index d9507dd0581..f2c379d835e 100644 --- a/net/dns_resolver/dns_key.c +++ b/net/dns_resolver/dns_key.c @@ -259,19 +259,15 @@ static int __init init_dns_resolver(void) if (!cred) return -ENOMEM; - keyring = key_alloc(&key_type_keyring, ".dns_resolver", 0, 0, cred, - (KEY_POS_ALL & ~KEY_POS_SETATTR) | - KEY_USR_VIEW | KEY_USR_READ, - KEY_ALLOC_NOT_IN_QUOTA); + keyring = keyring_alloc(".dns_resolver", 0, 0, cred, + (KEY_POS_ALL & ~KEY_POS_SETATTR) | + KEY_USR_VIEW | KEY_USR_READ, + KEY_ALLOC_NOT_IN_QUOTA, NULL); if (IS_ERR(keyring)) { ret = PTR_ERR(keyring); goto failed_put_cred; } - ret = key_instantiate_and_link(keyring, NULL, 0, NULL, NULL); - if (ret < 0) - goto failed_put_key; - ret = register_key_type(&key_type_dns_resolver); if (ret < 0) goto failed_put_key; @@ -303,3 +299,4 @@ static void __exit exit_dns_resolver(void) module_init(init_dns_resolver) module_exit(exit_dns_resolver) MODULE_LICENSE("GPL"); + |