From: "Jarkko Sakkinen" <jarkko@kernel.org>
To: "Jarkko Sakkinen" <jarkko@kernel.org>,
"Silvio Gissi" <sifonsec@amazon.com>,
"David Howells" <dhowells@redhat.com>
Cc: "Hazem Mohamed Abuelfotoh" <abuehaze@amazon.com>,
<linux-afs@lists.infradead.org>, <linux-cifs@vger.kernel.org>,
<keyrings@vger.kernel.org>, <netdev@vger.kernel.org>,
<stable@vger.kernel.org>
Subject: Re: [PATCH] keys: Fix overwrite of key expiration on instantiation
Date: Tue, 19 Mar 2024 20:12:28 +0200 [thread overview]
Message-ID: <CZXXHMPCCCE5.2SSZ17WVZPGRX@kernel.org> (raw)
In-Reply-To: <CZX9KHAO8163.2IASOXWIT4OZ5@kernel.org>
On Tue Mar 19, 2024 at 1:27 AM EET, Jarkko Sakkinen wrote:
> On Fri Mar 15, 2024 at 9:05 PM EET, Silvio Gissi wrote:
> > 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@amazon.com>
> > cc: David Howells <dhowells@redhat.com>
> > cc: Hazem Mohamed Abuelfotoh <abuehaze@amazon.com>
> > cc: linux-afs@lists.infradead.org
> > cc: linux-cifs@vger.kernel.org
> > cc: keyrings@vger.kernel.org
> > cc: netdev@vger.kernel.org
> > cc: stable@vger.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);
> > }
> > }
> >
>
> I checked the original commit and reflected to the fix:
>
> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
>
> David, I can pick this one too as I'm anyway sending PR for rc2?
>
> [1] https://lore.kernel.org/keyrings/CZX77XLG67HZ.UAU4NUQO27JP@kernel.org/
I've applied this to my tree. Can drop on request but otherwise
including to rc2 PR.
BR, Jarkko
prev parent reply other threads:[~2024-03-19 18:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-15 19:05 [PATCH] keys: Fix overwrite of key expiration on instantiation Silvio Gissi
2024-03-18 23:27 ` Jarkko Sakkinen
2024-03-19 18:12 ` Jarkko Sakkinen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CZXXHMPCCCE5.2SSZ17WVZPGRX@kernel.org \
--to=jarkko@kernel.org \
--cc=abuehaze@amazon.com \
--cc=dhowells@redhat.com \
--cc=keyrings@vger.kernel.org \
--cc=linux-afs@lists.infradead.org \
--cc=linux-cifs@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sifonsec@amazon.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).