Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jonathan McDowell <noodles@fb.com>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>,
        "linux-integrity@vger.kernel.org" <linux-integrity@vger.kernel.org>,
        "linux-security-module@vger.kernel.org" 
        <linux-security-module@vger.kernel.org>
CC:     Alexander Viro <viro@zeniv.linux.org.uk>,
        Mimi Zohar <zohar@linux.ibm.com>,
        Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
        James Morris <jmorris@namei.org>,
        "Serge E. Hallyn" <serge@hallyn.com>,
        Matthew Garrett <mjg59@srcf.ucam.org>,
        Dmitrii Potoskuev <dpotoskuev@fb.com>
Subject: [RFC PATCH v2 0/7] ima: Support measurement of kexec initramfs
 components
Thread-Topic: [RFC PATCH v2 0/7] ima: Support measurement of kexec initramfs
 components
Thread-Index: AQHYoouRiq7n37hqNE+boJLrxD1VXA==
Date:   Thu, 28 Jul 2022 14:08:53 +0000
Message-ID: <cover.1659003817.git.noodles@fb.com>
References: <cover.1657272362.git.noodles@fb.com>
In-Reply-To: <cover.1657272362.git.noodles@fb.com>
Accept-Language: en-GB, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?sIJAcPQbD7VBcVaJ9hMKFJhvdpD/aqdB8zAvrJK0u/N8xySZ2dd2RjtfOz23?=
 =?us-ascii?Q?6cDRY+ezoosEADUFyB/8I+klZuks1/xXz+ICy/LhZK+WXV5WlefrVnhWZCqm?=
 =?us-ascii?Q?PEVsgbflzpyWLaKUh3AAYafLOSTqaRLF2XTsryasmnfzBrFUXr9jO2t1DSvr?=
 =?us-ascii?Q?xUr67alXSXj3seLHdmKazQBgKVh4SRjFqy+pvfpiPeNsRcXXNXV2ci6yo0wZ?=
 =?us-ascii?Q?OvdulSYYy/7FKGQ6PV5M7l571sap+ById9hgGSbS8ck8q0GJdFXgcU1ASYUL?=
 =?us-ascii?Q?s3nDbiCdRRaIjELrw4RyhZizf73uxJUCP1YFGKbRIMeld4a8/XWwWb1tvSmA?=
 =?us-ascii?Q?YOvme4GR4czwZCen/WXLJuDjhDJuqCHYqFkFaWwyNeopMtTtB1sM6FK1Ndw+?=
 =?us-ascii?Q?9xA7fE6rtoEvJG/s7ZD/WNhjgrLc+bwzgVxck5RHnHDhXyVG0Hb+cu886eQV?=
 =?us-ascii?Q?2HIi+5eqlOpDdDXYamWS42OfgS3VDmFe8tqZi3zOSPmmDw9DRS4tWiXcsNkm?=
 =?us-ascii?Q?S6j6Dfcr64Y7iugVBacmBOg5PmCGlyFlWGeuDFK3hJjT5bFMXpSHTUnbAKGP?=
 =?us-ascii?Q?95QwT+3Ndm/ewrrlHlRcHpAaiK30byOGH6AsYhSMAd9SvJQc1EWPZX3oxyzU?=
 =?us-ascii?Q?7nqnJy565Zn8m09kB+nfrx8BAFo+WyPP41YWN1ey78sKlWakQENFY/NmbgEn?=
 =?us-ascii?Q?2Tw8W3bHeLl5sSV0W+2Qn9v8vR0a9NJSknuazdeaknB5USziDA620YQLD/xR?=
 =?us-ascii?Q?OEWT5AQ4jNPmMiPAIUwa0b3blfWmvEULBBW+GHSI5lBr+hwllJcS+88+ui8F?=
 =?us-ascii?Q?Tsn9kAySyJtuQgYhdbC86y3lk423oavabeqxq0lKsCJRMddVwc82UIXsL0fT?=
 =?us-ascii?Q?Ov9p+R2ccZehcvM5tmvu8BKfyEdI2alvC87Mp+RitVBaq2UOPqh4sgTpW+cA?=
 =?us-ascii?Q?XS7eyoMTR2JmQC9LL0xHVWHKpPXYpGpdG00QpyZ4tQUIlbvaFJlgB+WRFIo/?=
 =?us-ascii?Q?Ob66fnuGLms68q3ME22uXQnmbrgMnlioF89YtFQBUyhpZf/IgmTapjdGpBzg?=
 =?us-ascii?Q?rwrRIEtSbgEAEYSn4xc3BUWvum1R8w4wSMXtHjixyNVTFGoThD84HyFZ0pWr?=
 =?us-ascii?Q?7IzgxzI9oddX6zGqIh/RhI9dHq+5LXWiGcXVU2SzJE3hx0v/rkYxyAzjWjCe?=
 =?us-ascii?Q?gJVdrOfT9sw5qvOXZMpjNrYd4C3ntAHpb+Ou+8FHPhKLzacf5GTPaSkMQB9x?=
 =?us-ascii?Q?wYUsdzsS5QbUPUmmcWMTw8DOOZsXTPJGZpH66ioteY048GxHXvY7kWiGCSmg?=
 =?us-ascii?Q?cbKAF+MtR3F3BQqPITQapegydSL9RS6C+HdPpvOKqnNSOYrBUZybAz39ylei?=
 =?us-ascii?Q?lDiEEU5kZG3qdRW5mNgxC4Wxdh0V4ZF+i3AG/b7770Pm0nNyjBNnGSq3mKHd?=
 =?us-ascii?Q?6PmC+YNSRewpM49nYXIysc8NmIVZHHWniupPn4oHX/UA6+DaQPXolmzdSwh/?=
 =?us-ascii?Q?6uJ7Yuqs57fVRUcgyqaaPSyrJloM7rNWTo3zEnSsNIoxJPU7oPBHbZsI3J3H?=
 =?us-ascii?Q?9P+Nebisd0kiziy+LkMBWIEuAJLk3QSGMnH9RXUq?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <DC3AC7FDEE49AB4B8375AB8FF63C7268@namprd15.prod.outlook.com>
MIME-Version: 1.0
X-OriginatorOrg: fb.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR15MB4552.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 82f52c7f-b3fb-4683-e8af-08da70a2b3ed
X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jul 2022 14:08:53.1603
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: ouEdU8IIEw+XmQrz6ZbktwzlmBUykkCEicXu1JneIMCQwQrBkMnVCf+2bCXyZxHI
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR15MB4256
X-Proofpoint-GUID: z8w3XXy1vMl9fWHlSjhZwvZdhhVNl7J1
X-Proofpoint-ORIG-GUID: z8w3XXy1vMl9fWHlSjhZwvZdhhVNl7J1
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-07-28_05,2022-07-28_02,2022-06-22_01
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This patchset is not yet complete, but it's already moving around a
bunch of stuff so I am sending it out to get either some agreement that
it's a vaguely sane approach, or some pointers about how I should be
doing this instead. I've not had a lot of feedback from v1 but the
kernel test robot threw up a couple of compile failures and a boot
failure so this is a revised patch set with those fixed.

It aims to add an option to IMA to measure the individual components
that make up an initramfs that is being used for kexec, rather than the
entire initramfs blob. For example in the situation where the initramfs
blob contains some uncompressed early firmware and then a compressed
filesystem there will be 2 measurements folded into the TPM, and logged
into the IMA log.

Why is this useful? Consider the situation where images have been split
out to a set of firmware, an initial userspace image that does the usual
piece of finding the right root device and switching into it, and an
image that contains the necessary kernel modules.

For a given machine the firmware + userspace images are unlikely to
change often, while the kernel modules change with each upgrade. If we
measure the concatenated image as a single blob then it is necessary to
calculate all the permutations of images that result, which means
building and hashing the combinations. By measuring each piece
individually a hash can be calculated for each component up front
allowing for easier analysis of whether the running state is an expected
one.

The KEXEC_FILE_LOAD syscall only allows a single initramfs image to be
passed in; one option would be to add a new syscall that supports
multiple initramfs fds and read each in kimage_file_prepare_segments().

Instead I've taken a more complicated approach that doesn't involve a
new syscall or altering the kexec userspace, building on top of the way
the boot process parses the initramfs and using that same technique
within the IMA measurement for the READING_KEXEC_INITRAMFS path.

To that end I've pulled the cpio handling code out of init/initramfs.c
and into lib/ and made it usable outside of __init when required. That's
involved having to pull some of the init_syscall file handling routines
into the cpio code (and cleaning them up when the cpio code is the only
user). I think there's the potential for a bit more code clean up here,
but I've tried to keep it limited to providing the functionality I need
and making checkpatch happy for the moment.

Patch 1 pulls the code out to lib/ and moves the global static variables
that hold the state into a single context structure.

Patch 2 does some minimal error path improvements so we're not just
passing a string around to indicate there's been an error.

Patch 3 is where I pull the file handling routines into the cpio code.
It didn't seem worth moving this to somewhere other code could continue
to use them when only the cpio code was doing so, but it did involve a
few extra exported functions from fs/

Patch 4 actually allows the use of the cpio code outside of __init when
CONFIG_CPIO is selected.

Patch 5 is a hack so I can use the generic decompress + gzip outside of
__init. If this overall approach is acceptable then I'll do some work to
make this generically available in the same manner as the cpio code
before actually submitting for inclusion.

Patch 6 is the actual piece I'm interested in; doing individual
measurements for each component within IMA.

v2:

Fix printf format string in populate_initrd_image (kernel test robot, i386 build)
Include <linux/limits.h> in cpio.h (kernel test robot, uml build)
Fix EEXIST checking for device nodes (kernel test robot, boot attempt)


Jonathan McDowell (7):
  initramfs: Move cpio handling routines into lib/
  lib/cpio: Improve error handling
  lib/cpio: use non __init filesystem related functions
  lib/cpio: Allow use outside of initramfs creation
  lib/cpio: Add a parse-only option that doesn't extract any files
  HACK: Allow the use of generic decompress with gzip outside __init
  ima: Support measurement of kexec initramfs components

 fs/init.c                         | 101 -----
 fs/internal.h                     |   4 -
 include/linux/cpio.h              |  92 +++++
 include/linux/fs.h                |   4 +
 include/linux/init_syscalls.h     |   6 -
 init/initramfs.c                  | 524 +++----------------------
 lib/Kconfig                       |   3 +
 lib/Makefile                      |   2 +-
 lib/cpio.c                        | 609 ++++++++++++++++++++++++++++++
 lib/decompress.c                  |   4 +-
 lib/decompress_inflate.c          |   4 +
 security/integrity/ima/Kconfig    |  16 +
 security/integrity/ima/ima_main.c | 191 +++++++++-
 13 files changed, 965 insertions(+), 595 deletions(-)
 create mode 100644 include/linux/cpio.h
 create mode 100644 lib/cpio.c

-- 
2.30.2