diff options
| author |   David Howells <dhowells@redhat.com> | 2016-04-06 16:14:26 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-04-11 22:44:15 +0100 |
| commit | 77f68bac9481ad440f4f34dda3d28c2dce6eb87b (patch) | |
| tree | 3366c0ab94b42cc67fdbe36a2af7ac6bc1a50467 /security/integrity | |
| parent | KEYS: Move the point of trust determination to __key_link() (diff) | |
| download | linux-dev-77f68bac9481ad440f4f34dda3d28c2dce6eb87b.tar.xz linux-dev-77f68bac9481ad440f4f34dda3d28c2dce6eb87b.zip | |
KEYS: Remove KEY_FLAG_TRUSTED and KEY_ALLOC_TRUSTED
Remove KEY_FLAG_TRUSTED and KEY_ALLOC_TRUSTED as they're no longer
meaningful. Also we can drop the trusted flag from the preparse structure.
Given this, we no longer need to pass the key flags through to
restrict_link().
Further, we can now get rid of keyring_restrict_trusted_only() also.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security/integrity')
| -rw-r--r-- | security/integrity/digsig.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c index d647178c6bbd..98ee4c752cf5 100644 --- a/security/integrity/digsig.c +++ b/security/integrity/digsig.c @@ -51,12 +51,11 @@ static bool init_keyring __initdata; */ static int restrict_link_by_ima_mok(struct key *keyring, const struct key_type *type, - unsigned long flags, const union key_payload *payload) { int ret; - ret = restrict_link_by_builtin_trusted(keyring, type, flags, payload); + ret = restrict_link_by_builtin_trusted(keyring, type, payload); if (ret != -ENOKEY) return ret; |