Patch "keys: Fix overwrite of key expiration on instantiation" has been added to the 5.10-stable tree

[gregkh at linuxfoundation.org]

This is a note to let you know that I've just added the patch titled

    keys: Fix overwrite of key expiration on instantiation

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     keys-fix-overwrite-of-key-expiration-on-instantiation.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable at vger.kernel.org> know about it.


>From 9da27fb65a14c18efd4473e2e82b76b53ba60252 Mon Sep 17 00:00:00 2001
From: Silvio Gissi <sifonsec at amazon.com>
Date: Fri, 15 Mar 2024 15:05:39 -0400
Subject: keys: Fix overwrite of key expiration on instantiation

From: Silvio Gissi <sifonsec at amazon.com>

commit 9da27fb65a14c18efd4473e2e82b76b53ba60252 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: 39299bdd2546 ("keys, dns: Allow key types (eg. DNS) to be reclaimed immediately on expiry")
Signed-off-by: Silvio Gissi <sifonsec at amazon.com>
cc: David Howells <dhowells at redhat.com>
cc: Hazem Mohamed Abuelfotoh <abuehaze at amazon.com>
cc: linux-afs at lists.infradead.org
cc: linux-cifs at vger.kernel.org
cc: keyrings at vger.kernel.org
cc: netdev at vger.kernel.org
cc: stable at vger.kernel.org
Reviewed-by: Jarkko Sakkinen <jarkko at kernel.org>
Signed-off-by: Jarkko Sakkinen <jarkko at kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 security/keys/key.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -464,7 +464,8 @@ static int __key_instantiate_and_link(st
 			if (authkey)
 				key_invalidate(authkey);
 
-			key_set_expiry(key, prep->expiry);
+			if (prep->expiry != TIME64_MAX)
+				key_set_expiry(key, prep->expiry);
 		}
 	}
 


Patches currently in stable-queue which might be from sifonsec at amazon.com are

queue-5.10/keys-fix-overwrite-of-key-expiration-on-instantiation.patch