From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mimi Zohar <zohar@linux•vnet.ibm.com>,
Dmitry Kasatkin <dmitry.kasatkin@gmail•com>,
James Morris <jmorris@namei•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Jiri Bohac <jbohac@suse•cz>, David Howells <dhowells@redhat•com>,
Matthew Garrett <mjg59@google•com>,
Thiago Jung Bauermann <bauerman@linux•ibm.com>
Subject: linux-next: manual merge of the integrity tree with the security tree
Date: Wed, 21 Aug 2019 13:27:57 +1000 [thread overview]
Message-ID: <20190821132757.4a12dada@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1875 bytes --]
Hi all,
Today's linux-next merge of the integrity tree got a conflict in:
arch/s390/kernel/machine_kexec_file.c
between commit:
99d5cadfde2b ("kexec_file: split KEXEC_VERIFY_SIG into KEXEC_SIG and KEXEC_SIG_FORCE")
from the security tree and commit:
c8424e776b09 ("MODSIGN: Export module signature definitions")
from the integrity tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/s390/kernel/machine_kexec_file.c
index c0f33ba49a9a,1ac9fbc6e01e..000000000000
--- a/arch/s390/kernel/machine_kexec_file.c
+++ b/arch/s390/kernel/machine_kexec_file.c
@@@ -22,29 -22,7 +22,7 @@@ const struct kexec_file_ops * const kex
NULL,
};
-#ifdef CONFIG_KEXEC_VERIFY_SIG
+#ifdef CONFIG_KEXEC_SIG
- /*
- * Module signature information block.
- *
- * The constituents of the signature section are, in order:
- *
- * - Signer's name
- * - Key identifier
- * - Signature data
- * - Information block
- */
- struct module_signature {
- u8 algo; /* Public-key crypto algorithm [0] */
- u8 hash; /* Digest algorithm [0] */
- u8 id_type; /* Key identifier type [PKEY_ID_PKCS7] */
- u8 signer_len; /* Length of signer's name [0] */
- u8 key_id_len; /* Length of key identifier [0] */
- u8 __pad[3];
- __be32 sig_len; /* Length of signature data */
- };
-
- #define PKEY_ID_PKCS7 2
-
int s390_verify_sig(const char *kernel, unsigned long kernel_len)
{
const unsigned long marker_len = sizeof(MODULE_SIG_STRING) - 1;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-08-21 3:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-21 3:27 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-11-02 2:02 linux-next: manual merge of the integrity tree with the security tree Stephen Rothwell
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=20190821132757.4a12dada@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bauerman@linux$(echo .)ibm.com \
--cc=dhowells@redhat$(echo .)com \
--cc=dmitry.kasatkin@gmail$(echo .)com \
--cc=jbohac@suse$(echo .)cz \
--cc=jmorris@namei$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mjg59@google$(echo .)com \
--cc=zohar@linux$(echo .)vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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