Merge tag '6.9-rc7-ksmbd-fixes' of git://git.samba.org/ksmbd (2024-05-08
10:39:53 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
tags/keys-next-6.10-rc1
for you to fetch changes up to 9da27fb65a14c18efd4473e2e82b76b53ba60252:
keys: Fix overwrite of key expiration on instantiation (2024-05-09 16:28:58
+0300)
----------------------------------------------------------------
Hi
2nd trial of the earlier PR with more appropriate tag:
1. Do no overwrite the key expiration once it is set.
2. Early to quota updates for keys to key_put(), instead of
updating them in key_gc_unused_keys().
[1] Earlier PR:
https://lore.kernel.org/linux-integrity/20240326143838.15076-1-jar...@kernel.org/
BR, Jarkko
----------------------------------------------------------------
Luis Henriques (1):
keys: update key quotas in key_put()
Silvio Gissi (1):
keys: Fix overwrite of key expiration on instantiation
security/keys/gc.c | 8 --------
security/keys/key.c | 35 ++++++++++++++++++++++++-----------
security/keys/keyctl.c | 11 ++++++-----
3 files changed, 30 insertions(+), 24 deletions(-)
