mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 21:03:32 +00:00
keys: Fix overwrite of key expiration on instantiation
commit9da27fb65a
upstream. The expiry time of a key is unconditionally overwritten during instantiation, defaulting to turn it permanent. This causes a problem for DNS resolution as the expiration set by user-space is overwritten to TIME64_MAX, disabling further DNS updates. Fix this by restoring the condition that key_set_expiry is only called when the pre-parser sets a specific expiry. Fixes:39299bdd25
("keys, dns: Allow key types (eg. DNS) to be reclaimed immediately on expiry") Signed-off-by: Silvio Gissi <sifonsec@amazon.com> cc: David Howells <dhowells@redhat.com> cc: Hazem Mohamed Abuelfotoh <abuehaze@amazon.com> cc: linux-afs@lists.infradead.org cc: linux-cifs@vger.kernel.org cc: keyrings@vger.kernel.org cc: netdev@vger.kernel.org cc: stable@vger.kernel.org Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
9fda5aed60
commit
25777f3f4e
1 changed files with 2 additions and 1 deletions
|
@ -464,6 +464,7 @@ static int __key_instantiate_and_link(struct key *key,
|
|||
if (authkey)
|
||||
key_invalidate(authkey);
|
||||
|
||||
if (prep->expiry != TIME64_MAX)
|
||||
key_set_expiry(key, prep->expiry);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue