From: "Mickaël Salaün" <mic@digikod.net>
To: David Howells <dhowells@redhat.com>,
Eric Snowberg <eric.snowberg@oracle.com>
Cc: dwmw2@infradead.org, Jarkko Sakkinen <jarkko@kernel.org>,
James.Bottomley@HansenPartnership.com, masahiroy@kernel.org,
michal.lkml@markovi.net, jmorris@namei.org, serge@hallyn.com,
ardb@kernel.org, Mimi Zohar <zohar@linux.ibm.com>,
lszubowi@redhat.com, javierm@redhat.com,
keyrings@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kbuild@vger.kernel.org,
linux-security-module@vger.kernel.org,
Tyler Hicks <tyhicks@linux.microsoft.com>
Subject: Re: Conflict with Mickaël Salaün's blacklist patches [was [PATCH v5 0/4] Add EFI_CERT_X509_GUID support for dbx/mokx entries]
Date: Tue, 9 Feb 2021 14:59:14 +0100 [thread overview]
Message-ID: <5055b9b4-2808-8816-d50c-e651bd88a7c3@digikod.net> (raw)
In-Reply-To: <525705.1612876446@warthog.procyon.org.uk>
Hi David,
The only commit causing issues is commit f78e50c8f750 ("certs: Factor
out the blacklist hash creation"). I think my last patch fix the issue,
and I'm testing with the UEFI DBX, but I don't understand why this
change would have an impact. In the meantime you can push Eric's commits
first, I'll adapt my changes.
Mickaël
On 09/02/2021 14:14, David Howells wrote:
>
> Hi Eric, Mickaël,
>
> Do we have a consensus on this? From what's written here, I don't think I can
> ask Linus to pull the merge of your two branches. I feel that I probably need
> to push Eric's first as that fixes a CVE if I can't offer a merge.
>
> David
>
next prev parent reply other threads:[~2021-02-09 14:01 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 18:10 [PATCH v5 0/4] Add EFI_CERT_X509_GUID support for dbx/mokx entries Eric Snowberg
2021-01-22 18:10 ` [PATCH v5 1/4] certs: Add EFI_CERT_X509_GUID support for dbx entries Eric Snowberg
2021-01-28 3:54 ` Nayna
2021-01-28 4:11 ` Eric Snowberg
2021-01-28 15:35 ` Nayna
2021-01-28 15:58 ` David Howells
2021-01-29 1:56 ` Eric Snowberg
2021-01-22 18:10 ` [PATCH v5 2/4] certs: Move load_system_certificate_list to a common function Eric Snowberg
2021-01-22 18:10 ` [PATCH v5 3/4] certs: Add ability to preload revocation certs Eric Snowberg
2021-01-22 18:10 ` [PATCH v5 4/4] integrity: Load mokx variables into the blacklist keyring Eric Snowberg
2021-01-28 15:16 ` [PATCH v5 0/4] Add EFI_CERT_X509_GUID support for dbx/mokx entries David Howells
2021-01-28 15:27 ` Mimi Zohar
2021-01-28 15:29 ` Mimi Zohar
2021-01-28 15:41 ` Eric Snowberg
2021-02-03 16:26 ` Conflict with Mickaël Salaün's blacklist patches [was [PATCH v5 0/4] Add EFI_CERT_X509_GUID support for dbx/mokx entries] David Howells
2021-02-03 18:49 ` Mickaël Salaün
2021-02-04 3:53 ` Eric Snowberg
2021-02-04 8:26 ` Mickaël Salaün
2021-02-05 0:24 ` Eric Snowberg
2021-02-05 10:27 ` Mickaël Salaün
2021-02-06 1:14 ` Eric Snowberg
2021-02-06 18:30 ` Mickaël Salaün
2021-02-08 23:05 ` Eric Snowberg
2021-02-09 21:53 ` Mickaël Salaün
2021-02-10 12:07 ` Mickaël Salaün
2021-02-09 13:14 ` David Howells
2021-02-09 13:59 ` Mickaël Salaün [this message]
2021-02-09 16:46 ` David Howells
2021-02-12 11:49 ` Jarkko Sakkinen
2021-02-04 9:11 ` David Howells
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=5055b9b4-2808-8816-d50c-e651bd88a7c3@digikod.net \
--to=mic@digikod.net \
--cc=James.Bottomley@HansenPartnership.com \
--cc=ardb@kernel.org \
--cc=dhowells@redhat.com \
--cc=dwmw2@infradead.org \
--cc=eric.snowberg@oracle.com \
--cc=jarkko@kernel.org \
--cc=javierm@redhat.com \
--cc=jmorris@namei.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=lszubowi@redhat.com \
--cc=masahiroy@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=serge@hallyn.com \
--cc=tyhicks@linux.microsoft.com \
--cc=zohar@linux.ibm.com \
/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 NNTP newsgroup(s).