Unverified Commit b4a81101 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9035 keys: Fix overwrite of key expiration on instantiation 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiang Yang <xiangyang3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/RJ6IM25EOHTTKZ77NZGKSXESGV5FO4AO/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9TM8D 
 
Link:https://gitee.com/openeuler/kernel/pulls/9035

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 66c1cbd9 ebd39d17

security/keys/key.c

+2 −1
Original line number Diff line number Diff line
@@ -464,6 +464,7 @@ static int __key_instantiate_and_link(struct key *key, 
			if (authkey)

				key_invalidate(authkey);



			if (prep->expiry != TIME64_MAX)

				key_set_expiry(key, prep->expiry);

		}

	}