From ef6fed2eb60f1d490dd8c6b7a5ae88c29e77522a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 3 Jun 2024 21:25:26 +0200 Subject: Merging upstream version 5.10.218. Signed-off-by: Daniel Baumann --- security/keys/key.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'security/keys/key.c') diff --git a/security/keys/key.c b/security/keys/key.c index 67ad0826e..e5111ce17 100644 --- a/security/keys/key.c +++ b/security/keys/key.c @@ -464,7 +464,8 @@ static int __key_instantiate_and_link(struct key *key, if (authkey) key_invalidate(authkey); - key_set_expiry(key, prep->expiry); + if (prep->expiry != TIME64_MAX) + key_set_expiry(key, prep->expiry); } } -- cgit v1.2.3