From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7D190C433EF for ; Mon, 13 Jun 2022 17:15:57 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-434-UWtt2y-MNUCekUADyqEx7w-1; Mon, 13 Jun 2022 13:15:55 -0400 X-MC-Unique: UWtt2y-MNUCekUADyqEx7w-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8B554380670E; Mon, 13 Jun 2022 17:15:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 089B61121314; Mon, 13 Jun 2022 17:15:51 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 95E7F1947065; Mon, 13 Jun 2022 17:15:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B4531194705B for ; Mon, 13 Jun 2022 17:15:49 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9352A2026D2D; Mon, 13 Jun 2022 17:15:49 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8F4522026D64 for ; Mon, 13 Jun 2022 17:15:49 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7035685A585 for ; Mon, 13 Jun 2022 17:15:49 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-36-_xBPNe-ENimKYVhNnUCrZg-1; Mon, 13 Jun 2022 13:15:29 -0400 X-MC-Unique: _xBPNe-ENimKYVhNnUCrZg-1 Received: by mail-pg1-f173.google.com with SMTP id f65so6098638pgc.7 for ; Mon, 13 Jun 2022 10:15:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=HplHX2Dj1z/sWHxSKlJW/gqEIj/eDK55kENWjykpP0s=; b=PTWy2i3bjJiRAf0/kMAK4aBmHKG70njNzCa4bUji4SUv+OV5SMCMuVGXt5Ppo9ezRt Y2NlymRYaOvsWHFPE58wc3Tsx5OyKC9tCAovcLBrpTtsjhhlQ6A0CG2aggpoA3VwCfWR uAZsDIXig6EWhe/1ItgR+LUgaXudMG2I8JWx/PlBPysEg5Lv0KV3pD7Tw2//ncCwg7j+ y4jtisAlu8p2vbeyUun9P7wP9yuUN0Tb7UNrA00zj7PShWeV/+BSsc1d/JuFKS7W6S+B ndHDei10cx95w1TIn76GWr1GOJe2rqMd3332lUx5DDHnGsFMGs2l+ZWFV143rit6eSeg ajBQ== X-Gm-Message-State: AOAM5308mpBlPp7aNwjELE1ukhaYhujDynjxkK6obO3N1hMbpInYIPeJ G1/O2kCjb208S7+F3zhy9sIfVQ== X-Google-Smtp-Source: ABdhPJxeMM7KYRXm0u0KsG75RyBBXv3/0OQRUh4WZMtUklEUzQc43TFu+c9tkQBt+JNomJsFdNFtlg== X-Received: by 2002:a63:30f:0:b0:3fd:f9de:a35d with SMTP id 15-20020a63030f000000b003fdf9dea35dmr519789pgd.317.1655140528387; Mon, 13 Jun 2022 10:15:28 -0700 (PDT) Received: from localhost ([2620:15c:11a:202:c4fb:a1d8:47ef:f10c]) by smtp.gmail.com with UTF8SMTPSA id x12-20020a17090300cc00b00167705fd12asm5374876plc.135.2022.06.13.10.15.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 13 Jun 2022 10:15:27 -0700 (PDT) Date: Mon, 13 Jun 2022 10:15:25 -0700 From: Matthias Kaehlcke To: Alasdair Kergon , Mike Snitzer , Kees Cook , James Morris , "Serge E . Hallyn" Message-ID: References: <20220523211400.290537-1-mka@chromium.org> <20220523141325.v6.1.I3e928575a23481121e73286874c4c2bdb403355d@changeid> MIME-Version: 1.0 In-Reply-To: <20220523141325.v6.1.I3e928575a23481121e73286874c4c2bdb403355d@changeid> X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Subject: Re: [dm-devel] [PATCH v6 1/3] dm: Add verity helpers for LoadPin X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-security-module@vger.kernel.org, Douglas Anderson , linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, Song Liu , dm-devel@redhat.com, Milan Broz Errors-To: dm-devel-bounces@redhat.com Sender: "dm-devel" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Mike, does this look good to you or are any further changes needed to get this landed? Thanks Matthias On Mon, May 23, 2022 at 02:13:58PM -0700, Matthias Kaehlcke wrote: > LoadPin limits loading of kernel modules, firmware and certain > other files to a 'pinned' file system (typically a read-only > rootfs). To provide more flexibility LoadPin is being extended > to also allow loading these files from trusted dm-verity > devices. For that purpose LoadPin can be provided with a list > of verity root digests that it should consider as trusted. > > Add a bunch of helpers to allow LoadPin to check whether a DM > device is a trusted verity device. The new functions broadly > fall in two categories: those that need access to verity > internals (like the root digest), and the 'glue' between > LoadPin and verity. The new file dm-verity-loadpin.c contains > the glue functions. > > Signed-off-by: Matthias Kaehlcke > Acked-by: Kees Cook > --- > > Changes in v6: > - s/loadpin_trusted_verity_root_digests/dm_verity_loadpin_trusted_root_digests/ > - s/trusted_root_digest/dm_verity_loadpin_trusted_root_digest/ > - removed unnecessary symbol exports > > Changes in v5: > - changed dm_verity_loadpin_is_sb_trusted() to > dm_verity_loadpin_is_bdev_trusted() > - bumped version number to 1.8.1 > - deleted bad semicolon in declaration of stub for > dm_verity_loadpin_is_bdev_trusted() > - added 'Acked-by' tag from Kees > > Changes in v4: > - a trusted verity device must have a single target of > type 'verity' > - share list of verity digests with loadpin, deleted > dm_verity_loadpin_set_trusted_root_digests() > - dm_verity_loadpin_is_md_trusted() is now dm_verity_loadpin_is_sb_trusted(), > it receives a super_block instead of mapped_device. Updated kernel doc. > - changed struct trusted_root_digest to have an unsized > u8 array instead of a pointer > - extend 'dm-verity-objs' instead of 'dm-mod-objs' > > Changes in v3: > - none > > Changes in v2: > - none > > drivers/md/Makefile | 6 +++ > drivers/md/dm-verity-loadpin.c | 74 +++++++++++++++++++++++++++++++ > drivers/md/dm-verity-target.c | 33 +++++++++++++- > drivers/md/dm-verity.h | 4 ++ > include/linux/dm-verity-loadpin.h | 27 +++++++++++ > 5 files changed, 143 insertions(+), 1 deletion(-) > create mode 100644 drivers/md/dm-verity-loadpin.c > create mode 100644 include/linux/dm-verity-loadpin.h > > diff --git a/drivers/md/Makefile b/drivers/md/Makefile > index 0454b0885b01..71771901c823 100644 > --- a/drivers/md/Makefile > +++ b/drivers/md/Makefile > @@ -108,6 +108,12 @@ ifeq ($(CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG),y) > dm-verity-objs += dm-verity-verify-sig.o > endif > > +ifeq ($(CONFIG_DM_VERITY),y) > +ifeq ($(CONFIG_SECURITY_LOADPIN),y) > +dm-verity-objs += dm-verity-loadpin.o > +endif > +endif > + > ifeq ($(CONFIG_DM_AUDIT),y) > dm-mod-objs += dm-audit.o > endif > diff --git a/drivers/md/dm-verity-loadpin.c b/drivers/md/dm-verity-loadpin.c > new file mode 100644 > index 000000000000..10c18bc1652c > --- /dev/null > +++ b/drivers/md/dm-verity-loadpin.c > @@ -0,0 +1,74 @@ > +// SPDX-License-Identifier: GPL-2.0-only > + > +#include > +#include > +#include > + > +#include "dm.h" > +#include "dm-verity.h" > + > +#define DM_MSG_PREFIX "verity-loadpin" > + > +LIST_HEAD(dm_verity_loadpin_trusted_root_digests); > + > +static bool is_trusted_verity_target(struct dm_target *ti) > +{ > + u8 *root_digest; > + unsigned int digest_size; > + struct dm_verity_loadpin_trusted_root_digest *trd; > + bool trusted = false; > + > + if (!dm_is_verity_target(ti)) > + return false; > + > + if (dm_verity_get_root_digest(ti, &root_digest, &digest_size)) > + return false; > + > + list_for_each_entry(trd, &dm_verity_loadpin_trusted_root_digests, node) { > + if ((trd->len == digest_size) && > + !memcmp(trd->data, root_digest, digest_size)) { > + trusted = true; > + break; > + } > + } > + > + kfree(root_digest); > + > + return trusted; > +} > + > +/* > + * Determines whether the file system of a superblock is located on > + * a verity device that is trusted by LoadPin. > + */ > +bool dm_verity_loadpin_is_bdev_trusted(struct block_device *bdev) > +{ > + struct mapped_device *md; > + struct dm_table *table; > + struct dm_target *ti; > + int srcu_idx; > + bool trusted = false; > + > + if (list_empty(&dm_verity_loadpin_trusted_root_digests)) > + return false; > + > + md = dm_get_md(bdev->bd_dev); > + if (!md) > + return false; > + > + table = dm_get_live_table(md, &srcu_idx); > + > + if (dm_table_get_num_targets(table) != 1) > + goto out; > + > + ti = dm_table_get_target(table, 0); > + > + if (is_trusted_verity_target(ti)) > + trusted = true; > + > +out: > + dm_put_live_table(md, srcu_idx); > + dm_put(md); > + > + return trusted; > +} > diff --git a/drivers/md/dm-verity-target.c b/drivers/md/dm-verity-target.c > index 80133aae0db3..c5395e93525a 100644 > --- a/drivers/md/dm-verity-target.c > +++ b/drivers/md/dm-verity-target.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > > #define DM_MSG_PREFIX "verity" > > @@ -1310,9 +1311,39 @@ static int verity_ctr(struct dm_target *ti, unsigned argc, char **argv) > return r; > } > > +/* > + * Check whether a DM target is a verity target. > + */ > +bool dm_is_verity_target(struct dm_target *ti) > +{ > + return ti->type->module == THIS_MODULE; > +} > + > +/* > + * Get the root digest of a verity target. > + * > + * Returns a copy of the root digest, the caller is responsible for > + * freeing the memory of the digest. > + */ > +int dm_verity_get_root_digest(struct dm_target *ti, u8 **root_digest, unsigned int *digest_size) > +{ > + struct dm_verity *v = ti->private; > + > + if (!dm_is_verity_target(ti)) > + return -EINVAL; > + > + *root_digest = kmemdup(v->root_digest, v->digest_size, GFP_KERNEL); > + if (*root_digest == NULL) > + return -ENOMEM; > + > + *digest_size = v->digest_size; > + > + return 0; > +} > + > static struct target_type verity_target = { > .name = "verity", > - .version = {1, 8, 0}, > + .version = {1, 8, 1}, > .module = THIS_MODULE, > .ctr = verity_ctr, > .dtr = verity_dtr, > diff --git a/drivers/md/dm-verity.h b/drivers/md/dm-verity.h > index 4e769d13473a..c832cc3e3d24 100644 > --- a/drivers/md/dm-verity.h > +++ b/drivers/md/dm-verity.h > @@ -129,4 +129,8 @@ extern int verity_hash(struct dm_verity *v, struct ahash_request *req, > extern int verity_hash_for_block(struct dm_verity *v, struct dm_verity_io *io, > sector_t block, u8 *digest, bool *is_zero); > > +extern bool dm_is_verity_target(struct dm_target *ti); > +extern int dm_verity_get_root_digest(struct dm_target *ti, u8 **root_digest, > + unsigned int *digest_size); > + > #endif /* DM_VERITY_H */ > diff --git a/include/linux/dm-verity-loadpin.h b/include/linux/dm-verity-loadpin.h > new file mode 100644 > index 000000000000..fb695ecaa5d5 > --- /dev/null > +++ b/include/linux/dm-verity-loadpin.h > @@ -0,0 +1,27 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > + > +#ifndef __LINUX_DM_VERITY_LOADPIN_H > +#define __LINUX_DM_VERITY_LOADPIN_H > + > +#include > + > +struct block_device; > + > +extern struct list_head dm_verity_loadpin_trusted_root_digests; > + > +struct dm_verity_loadpin_trusted_root_digest { > + struct list_head node; > + unsigned int len; > + u8 data[]; > +}; > + > +#if IS_ENABLED(CONFIG_SECURITY_LOADPIN) && IS_BUILTIN(CONFIG_DM_VERITY) > +bool dm_verity_loadpin_is_bdev_trusted(struct block_device *bdev); > +#else > +static inline bool dm_verity_loadpin_is_bdev_trusted(struct block_device *bdev) > +{ > + return false; > +} > +#endif > + > +#endif /* __LINUX_DM_VERITY_LOADPIN_H */ > -- > 2.36.1.124.g0e6072fb45-goog > -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2379C433EF for ; Mon, 13 Jun 2022 19:19:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245724AbiFMTTy (ORCPT ); Mon, 13 Jun 2022 15:19:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348926AbiFMTSY (ORCPT ); Mon, 13 Jun 2022 15:18:24 -0400 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07623313A0 for ; Mon, 13 Jun 2022 10:15:29 -0700 (PDT) Received: by mail-pg1-x52b.google.com with SMTP id h192so6112663pgc.4 for ; Mon, 13 Jun 2022 10:15:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=HplHX2Dj1z/sWHxSKlJW/gqEIj/eDK55kENWjykpP0s=; b=DqStzqcZt8eFT2eOiyFphW3284ou3VB/B0VSmaKnmfmYTUjrRf0X39Xd+f7wilrK8O gCuJ5mksskKjlT9sQZJ/0W6BLQhy+PDGjGJeeZy0lNpZtIAiCoThrATw8kB79tsD1NFM ocxPy/XOH6QkVlvvPavuovxKddyLa6ngaCtUs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=HplHX2Dj1z/sWHxSKlJW/gqEIj/eDK55kENWjykpP0s=; b=Pr7lPCJ+9QwqsWcXzr3vCbW/faxEudXG/ikvRQJdATrh3OSXhIulqlC3RKFhMc2TZi RwOHO3A0g6eBbo6xBtpXd3rApFLLV8uUK7/mlLCXDY6ffb7wbWk9U3bmQi4edTShQBQv 9vy9B+GH7wUBAiz40/N/CAPZRTlcCuR+EaON0gTS1Ovac7zbXtfisAnPv6Xwk/5Qn93G 9nzUXCYA8dda0tyxkG4qIZn1cpc1ncXb1RVo5ORMGSLfu533UsyWz3v/aATHTmwQfol5 9mw7Z/e1y55f0iLegBSWg9tQB/IMXifpYIA4uckyaMRQS3DV/2t9rbxd+cOmOy/phuR0 HlSA== X-Gm-Message-State: AOAM533ZenDzNM7aqKbkK7po1QHDrXmRM0Cxqfx4DtYV/pGrXTNQt5Wf XMi8BVnNyisVRUkRLy2Lr+LEd5eb3Ggo3A== X-Google-Smtp-Source: ABdhPJxeMM7KYRXm0u0KsG75RyBBXv3/0OQRUh4WZMtUklEUzQc43TFu+c9tkQBt+JNomJsFdNFtlg== X-Received: by 2002:a63:30f:0:b0:3fd:f9de:a35d with SMTP id 15-20020a63030f000000b003fdf9dea35dmr519789pgd.317.1655140528387; Mon, 13 Jun 2022 10:15:28 -0700 (PDT) Received: from localhost ([2620:15c:11a:202:c4fb:a1d8:47ef:f10c]) by smtp.gmail.com with UTF8SMTPSA id x12-20020a17090300cc00b00167705fd12asm5374876plc.135.2022.06.13.10.15.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 13 Jun 2022 10:15:27 -0700 (PDT) Date: Mon, 13 Jun 2022 10:15:25 -0700 From: Matthias Kaehlcke To: Alasdair Kergon , Mike Snitzer , Kees Cook , James Morris , "Serge E . Hallyn" Cc: Milan Broz , dm-devel@redhat.com, linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, Song Liu , Douglas Anderson , linux-security-module@vger.kernel.org Subject: Re: [PATCH v6 1/3] dm: Add verity helpers for LoadPin Message-ID: References: <20220523211400.290537-1-mka@chromium.org> <20220523141325.v6.1.I3e928575a23481121e73286874c4c2bdb403355d@changeid> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20220523141325.v6.1.I3e928575a23481121e73286874c4c2bdb403355d@changeid> Precedence: bulk List-ID: X-Mailing-List: linux-raid@vger.kernel.org Mike, does this look good to you or are any further changes needed to get this landed? Thanks Matthias On Mon, May 23, 2022 at 02:13:58PM -0700, Matthias Kaehlcke wrote: > LoadPin limits loading of kernel modules, firmware and certain > other files to a 'pinned' file system (typically a read-only > rootfs). To provide more flexibility LoadPin is being extended > to also allow loading these files from trusted dm-verity > devices. For that purpose LoadPin can be provided with a list > of verity root digests that it should consider as trusted. > > Add a bunch of helpers to allow LoadPin to check whether a DM > device is a trusted verity device. The new functions broadly > fall in two categories: those that need access to verity > internals (like the root digest), and the 'glue' between > LoadPin and verity. The new file dm-verity-loadpin.c contains > the glue functions. > > Signed-off-by: Matthias Kaehlcke > Acked-by: Kees Cook > --- > > Changes in v6: > - s/loadpin_trusted_verity_root_digests/dm_verity_loadpin_trusted_root_digests/ > - s/trusted_root_digest/dm_verity_loadpin_trusted_root_digest/ > - removed unnecessary symbol exports > > Changes in v5: > - changed dm_verity_loadpin_is_sb_trusted() to > dm_verity_loadpin_is_bdev_trusted() > - bumped version number to 1.8.1 > - deleted bad semicolon in declaration of stub for > dm_verity_loadpin_is_bdev_trusted() > - added 'Acked-by' tag from Kees > > Changes in v4: > - a trusted verity device must have a single target of > type 'verity' > - share list of verity digests with loadpin, deleted > dm_verity_loadpin_set_trusted_root_digests() > - dm_verity_loadpin_is_md_trusted() is now dm_verity_loadpin_is_sb_trusted(), > it receives a super_block instead of mapped_device. Updated kernel doc. > - changed struct trusted_root_digest to have an unsized > u8 array instead of a pointer > - extend 'dm-verity-objs' instead of 'dm-mod-objs' > > Changes in v3: > - none > > Changes in v2: > - none > > drivers/md/Makefile | 6 +++ > drivers/md/dm-verity-loadpin.c | 74 +++++++++++++++++++++++++++++++ > drivers/md/dm-verity-target.c | 33 +++++++++++++- > drivers/md/dm-verity.h | 4 ++ > include/linux/dm-verity-loadpin.h | 27 +++++++++++ > 5 files changed, 143 insertions(+), 1 deletion(-) > create mode 100644 drivers/md/dm-verity-loadpin.c > create mode 100644 include/linux/dm-verity-loadpin.h > > diff --git a/drivers/md/Makefile b/drivers/md/Makefile > index 0454b0885b01..71771901c823 100644 > --- a/drivers/md/Makefile > +++ b/drivers/md/Makefile > @@ -108,6 +108,12 @@ ifeq ($(CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG),y) > dm-verity-objs += dm-verity-verify-sig.o > endif > > +ifeq ($(CONFIG_DM_VERITY),y) > +ifeq ($(CONFIG_SECURITY_LOADPIN),y) > +dm-verity-objs += dm-verity-loadpin.o > +endif > +endif > + > ifeq ($(CONFIG_DM_AUDIT),y) > dm-mod-objs += dm-audit.o > endif > diff --git a/drivers/md/dm-verity-loadpin.c b/drivers/md/dm-verity-loadpin.c > new file mode 100644 > index 000000000000..10c18bc1652c > --- /dev/null > +++ b/drivers/md/dm-verity-loadpin.c > @@ -0,0 +1,74 @@ > +// SPDX-License-Identifier: GPL-2.0-only > + > +#include > +#include > +#include > + > +#include "dm.h" > +#include "dm-verity.h" > + > +#define DM_MSG_PREFIX "verity-loadpin" > + > +LIST_HEAD(dm_verity_loadpin_trusted_root_digests); > + > +static bool is_trusted_verity_target(struct dm_target *ti) > +{ > + u8 *root_digest; > + unsigned int digest_size; > + struct dm_verity_loadpin_trusted_root_digest *trd; > + bool trusted = false; > + > + if (!dm_is_verity_target(ti)) > + return false; > + > + if (dm_verity_get_root_digest(ti, &root_digest, &digest_size)) > + return false; > + > + list_for_each_entry(trd, &dm_verity_loadpin_trusted_root_digests, node) { > + if ((trd->len == digest_size) && > + !memcmp(trd->data, root_digest, digest_size)) { > + trusted = true; > + break; > + } > + } > + > + kfree(root_digest); > + > + return trusted; > +} > + > +/* > + * Determines whether the file system of a superblock is located on > + * a verity device that is trusted by LoadPin. > + */ > +bool dm_verity_loadpin_is_bdev_trusted(struct block_device *bdev) > +{ > + struct mapped_device *md; > + struct dm_table *table; > + struct dm_target *ti; > + int srcu_idx; > + bool trusted = false; > + > + if (list_empty(&dm_verity_loadpin_trusted_root_digests)) > + return false; > + > + md = dm_get_md(bdev->bd_dev); > + if (!md) > + return false; > + > + table = dm_get_live_table(md, &srcu_idx); > + > + if (dm_table_get_num_targets(table) != 1) > + goto out; > + > + ti = dm_table_get_target(table, 0); > + > + if (is_trusted_verity_target(ti)) > + trusted = true; > + > +out: > + dm_put_live_table(md, srcu_idx); > + dm_put(md); > + > + return trusted; > +} > diff --git a/drivers/md/dm-verity-target.c b/drivers/md/dm-verity-target.c > index 80133aae0db3..c5395e93525a 100644 > --- a/drivers/md/dm-verity-target.c > +++ b/drivers/md/dm-verity-target.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > > #define DM_MSG_PREFIX "verity" > > @@ -1310,9 +1311,39 @@ static int verity_ctr(struct dm_target *ti, unsigned argc, char **argv) > return r; > } > > +/* > + * Check whether a DM target is a verity target. > + */ > +bool dm_is_verity_target(struct dm_target *ti) > +{ > + return ti->type->module == THIS_MODULE; > +} > + > +/* > + * Get the root digest of a verity target. > + * > + * Returns a copy of the root digest, the caller is responsible for > + * freeing the memory of the digest. > + */ > +int dm_verity_get_root_digest(struct dm_target *ti, u8 **root_digest, unsigned int *digest_size) > +{ > + struct dm_verity *v = ti->private; > + > + if (!dm_is_verity_target(ti)) > + return -EINVAL; > + > + *root_digest = kmemdup(v->root_digest, v->digest_size, GFP_KERNEL); > + if (*root_digest == NULL) > + return -ENOMEM; > + > + *digest_size = v->digest_size; > + > + return 0; > +} > + > static struct target_type verity_target = { > .name = "verity", > - .version = {1, 8, 0}, > + .version = {1, 8, 1}, > .module = THIS_MODULE, > .ctr = verity_ctr, > .dtr = verity_dtr, > diff --git a/drivers/md/dm-verity.h b/drivers/md/dm-verity.h > index 4e769d13473a..c832cc3e3d24 100644 > --- a/drivers/md/dm-verity.h > +++ b/drivers/md/dm-verity.h > @@ -129,4 +129,8 @@ extern int verity_hash(struct dm_verity *v, struct ahash_request *req, > extern int verity_hash_for_block(struct dm_verity *v, struct dm_verity_io *io, > sector_t block, u8 *digest, bool *is_zero); > > +extern bool dm_is_verity_target(struct dm_target *ti); > +extern int dm_verity_get_root_digest(struct dm_target *ti, u8 **root_digest, > + unsigned int *digest_size); > + > #endif /* DM_VERITY_H */ > diff --git a/include/linux/dm-verity-loadpin.h b/include/linux/dm-verity-loadpin.h > new file mode 100644 > index 000000000000..fb695ecaa5d5 > --- /dev/null > +++ b/include/linux/dm-verity-loadpin.h > @@ -0,0 +1,27 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > + > +#ifndef __LINUX_DM_VERITY_LOADPIN_H > +#define __LINUX_DM_VERITY_LOADPIN_H > + > +#include > + > +struct block_device; > + > +extern struct list_head dm_verity_loadpin_trusted_root_digests; > + > +struct dm_verity_loadpin_trusted_root_digest { > + struct list_head node; > + unsigned int len; > + u8 data[]; > +}; > + > +#if IS_ENABLED(CONFIG_SECURITY_LOADPIN) && IS_BUILTIN(CONFIG_DM_VERITY) > +bool dm_verity_loadpin_is_bdev_trusted(struct block_device *bdev); > +#else > +static inline bool dm_verity_loadpin_is_bdev_trusted(struct block_device *bdev) > +{ > + return false; > +} > +#endif > + > +#endif /* __LINUX_DM_VERITY_LOADPIN_H */ > -- > 2.36.1.124.g0e6072fb45-goog >