From patchwork Thu May 11 18:50:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1780267 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=OHRNlxO8; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QHLZf1FC6z214r for ; Fri, 12 May 2023 04:51:05 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pxBNQ-0002ln-3B; Thu, 11 May 2023 18:50:56 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pxBNO-0002kz-Qf for kernel-team@lists.ubuntu.com; Thu, 11 May 2023 18:50:54 +0000 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 0F3053F438 for ; Thu, 11 May 2023 18:50:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1683831054; bh=QwZiu44XnL6ne544G1kqzQV8NFkR+mXGRrB/An5efvg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OHRNlxO8Fz3CamQ3ztRdmUbUKtbJjW976Wc/uRiBKpNJzL5g5fhW4E3gd6vRAWWvO /7BgNhmANHGga7W+Ngqwghz2mfQrRw+ir7U1h8YkoC17wel/MdD/w9K2JkVB+WsdsK HBLchxExToji1PWNc1VxMTHaQFzjf3ffwo3jp3G4KZXR2Mwc+yJ3YjqCIEcnMlu7Lz EqaOwWQtqreCEynoA2PuaajkKAIl5vcEObvQ15yuOZFJXiCaQHVWZyP6J06FHfqGxL fwElkc/yYREg+yT0T+Nu8xG+X4XUjepARkhajUmaYOrK5TMi5BmeziKX82cboxzHHw 0mamAwPIFLZMA== Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-1aae2223aaeso51178635ad.2 for ; Thu, 11 May 2023 11:50:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683831052; x=1686423052; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QwZiu44XnL6ne544G1kqzQV8NFkR+mXGRrB/An5efvg=; b=TwhPFwPeWEcge5nIpYzOanHOGtBy8KscPjD9uLKgDPNG6v9nWeRQqasPPErIs1xT9/ cbpF+BSUrAGDzQImfURZ5VJR1EKx3E8QBYlx3x7iVhSwrPLqhVoBmFSP7XZ0D/qnvp6v 940zLTdWJK03sFQB3caNgXeF5fu/hT4PdDsPZ/bk/KqyzR3rHwVdz2QdyGBG/yUQNfMR CDaKbXLRo0ufl+e4B3Xne1edkHEIdo1KfdVBEspK5iggRD07DdWtnncZBdLt4P81trkB Ej8LO7sQBfpdVg17N1GyuLq0u7zykzQC5DPI6ssKoxGrNQwiRjNJmD0BRIOzhoKSIeTx eiyA== X-Gm-Message-State: AC+VfDzZD375Cf75N/8BdUa0Kl4mnEiEdAm2IVbbKFST3lNNd87uZYdC /HGiGP4amKEVYU710zeWeG0VJ+134wJd7yeIqswOuKkZgGONjr9GIT046DMnHtxr/plRvf1PBFI UKSFaLpivyNOJv2T2uboJkApmWoBLVj7VmGuafLsvJ1w+YNpW/A== X-Received: by 2002:a17:902:fac4:b0:1ac:40f7:8b73 with SMTP id ld4-20020a170902fac400b001ac40f78b73mr21263440plb.54.1683831052369; Thu, 11 May 2023 11:50:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7QAij7Qpav1ydNI6mVCpHRVhFbFD8V5sjfySqH79KVtbq5OV/4dWJgdqEhBFsrT2cw2dbfrA== X-Received: by 2002:a17:902:fac4:b0:1ac:40f7:8b73 with SMTP id ld4-20020a170902fac400b001ac40f78b73mr21263428plb.54.1683831052097; Thu, 11 May 2023 11:50:52 -0700 (PDT) Received: from smtp.gmail.com (174-045-099-030.res.spectrum.com. [174.45.99.30]) by smtp.gmail.com with ESMTPSA id q13-20020a170902bd8d00b001a285269b70sm6237861pls.280.2023.05.11.11.50.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 11:50:51 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH][kinetic/linux] UBUNTU: [Config] CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y Date: Thu, 11 May 2023 12:50:38 -0600 Message-Id: <20230511185040.220555-7-tim.gardner@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230511185040.220555-1-tim.gardner@canonical.com> References: <20230511185040.220555-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2019040 Signed-off-by: Tim Gardner --- debian.master/config/annotations | 3 ++- debian.master/config/config.common.ubuntu | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index c0ac01c8a9db..3df52884f9ab 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -5664,7 +5664,8 @@ CONFIG_DM_UEVENT policy<{'amd64': 'y', 'arm64': ' CONFIG_DM_FLAKEY policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> CONFIG_DM_VERITY policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> -CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> +CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> +CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING note CONFIG_DM_VERITY_FEC policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> CONFIG_DM_SWITCH policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> CONFIG_DM_LOG_WRITES policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index cdb3ee35dfa0..dd24c6c72cf3 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2899,7 +2899,7 @@ CONFIG_DM_UNSTRIPED=m CONFIG_DM_VERITY=m # CONFIG_DM_VERITY_FEC is not set CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y -# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING is not set +CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y CONFIG_DM_WRITECACHE=m CONFIG_DM_ZERO=m CONFIG_DM_ZONED=m