keys: Fix overwrite of key expiration on instantiation
authorSilvio Gissi <sifonsec@amazon.com>
Fri, 15 Mar 2024 19:05:39 +0000 (15:05 -0400)
committerJarkko Sakkinen <jarkko@kernel.org>
Thu, 9 May 2024 13:28:58 +0000 (16:28 +0300)
commit9da27fb65a14c18efd4473e2e82b76b53ba60252
tree5af95b6a97d8e9e1e6060345dfa7a825f860f6e3
parent9578e327b2b4935a25d49e3891b8fcca9b6c10c6
keys: Fix overwrite of key expiration on instantiation

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: 39299bdd2546 ("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>
security/keys/key.c