diff options
author | David Howells <dhowells@redhat.com> | 2014-07-18 13:56:34 -0400 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2014-07-22 16:46:12 -0400 |
commit | 4d8c0250b841159b128785f7a7efbaff40cc8501 (patch) | |
tree | 88860f5296ab855ba75588a0ec3e9fce73b7def3 /Documentation/security | |
parent | 7dfa0ca6a95de65b7a7760630cdbd7d30f204bfa (diff) |
KEYS: Call ->free_preparse() even after ->preparse() returns an error
Call the ->free_preparse() key type op even after ->preparse() returns an
error as it does cleaning up type stuff.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Steve Dickson <steved@redhat.com>
Acked-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'Documentation/security')
-rw-r--r-- | Documentation/security/keys.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/security/keys.txt b/Documentation/security/keys.txt index 315cf96a41a2..8727c194ca16 100644 --- a/Documentation/security/keys.txt +++ b/Documentation/security/keys.txt | |||
@@ -1176,7 +1176,9 @@ The structure has a number of fields, some of which are mandatory: | |||
1176 | This method is only required if the preparse() method is provided, | 1176 | This method is only required if the preparse() method is provided, |
1177 | otherwise it is unused. It cleans up anything attached to the | 1177 | otherwise it is unused. It cleans up anything attached to the |
1178 | description, type_data and payload fields of the key_preparsed_payload | 1178 | description, type_data and payload fields of the key_preparsed_payload |
1179 | struct as filled in by the preparse() method. | 1179 | struct as filled in by the preparse() method. It will always be called |
1180 | after preparse() returns successfully, even if instantiate() or update() | ||
1181 | succeed. | ||
1180 | 1182 | ||
1181 | 1183 | ||
1182 | (*) int (*instantiate)(struct key *key, struct key_preparsed_payload *prep); | 1184 | (*) int (*instantiate)(struct key *key, struct key_preparsed_payload *prep); |