netdev - [PATCH] keys: Fix overwrite of key expiration on instantiation

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240315190539.1976-1-sifonsec@amazon.com>
Date: Fri, 15 Mar 2024 15:05:39 -0400
From: Silvio Gissi <sifonsec@...zon.com>
To:
CC: Silvio Gissi <sifonsec@...zon.com>, David Howells <dhowells@...hat.com>,
	Hazem Mohamed Abuelfotoh <abuehaze@...zon.com>,
	<linux-afs@...ts.infradead.org>, <linux-cifs@...r.kernel.org>,
	<keyrings@...r.kernel.org>, <netdev@...r.kernel.org>,
	<stable@...r.kernel.org>
Subject: [PATCH] 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@...zon.com>
cc: David Howells <dhowells@...hat.com>
cc: Hazem Mohamed Abuelfotoh <abuehaze@...zon.com>
cc: linux-afs@...ts.infradead.org
cc: linux-cifs@...r.kernel.org
cc: keyrings@...r.kernel.org
cc: netdev@...r.kernel.org
cc: stable@...r.kernel.org
---
 security/keys/key.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/security/keys/key.c b/security/keys/key.c
index 560790038329..0aa5f01d16ff 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -463,7 +463,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);
 		}
 	}
 
-- 
2.34.1