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 X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24005C433E9 for ; Fri, 5 Mar 2021 17:58:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E9023650A8 for ; Fri, 5 Mar 2021 17:58:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229792AbhCER6A (ORCPT ); Fri, 5 Mar 2021 12:58:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229576AbhCER5p (ORCPT ); Fri, 5 Mar 2021 12:57:45 -0500 Received: from bedivere.hansenpartnership.com (bedivere.hansenpartnership.com [IPv6:2607:fcd0:100:8a00::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A26E9C061574; Fri, 5 Mar 2021 09:57:45 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by bedivere.hansenpartnership.com (Postfix) with ESMTP id C8D791280557; Fri, 5 Mar 2021 09:57:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=hansenpartnership.com; s=20151216; t=1614967064; bh=I12qLg9Cwserkp5Y2dm2OSRdMTJvsQsUwHpn6DZphVo=; h=Message-ID:Subject:From:To:Date:In-Reply-To:References:From; b=HOVc499lijkDdTOqaUgES5NwYDqdRrMroJVLkIwh9RbwMbWm7DAkgJA47Zd2pPboR 1/MiiB5ca3cUAN48bPkaR1QtDnEVeHVxk6Qy2ZwiSCFQSj1+zHqtIqXvmVJJOOo1pY 6N0yglQoKMJdbxcZ8RSwQEnilHoli6AJJHCB8t9A= Received: from bedivere.hansenpartnership.com ([127.0.0.1]) by localhost (bedivere.hansenpartnership.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FpH8EscH_1PE; Fri, 5 Mar 2021 09:57:44 -0800 (PST) Received: from jarvis.int.hansenpartnership.com (unknown [IPv6:2601:600:8280:66d1::527]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bedivere.hansenpartnership.com (Postfix) with ESMTPSA id B0F2A1280555; Fri, 5 Mar 2021 09:57:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=hansenpartnership.com; s=20151216; t=1614967064; bh=I12qLg9Cwserkp5Y2dm2OSRdMTJvsQsUwHpn6DZphVo=; h=Message-ID:Subject:From:To:Date:In-Reply-To:References:From; b=HOVc499lijkDdTOqaUgES5NwYDqdRrMroJVLkIwh9RbwMbWm7DAkgJA47Zd2pPboR 1/MiiB5ca3cUAN48bPkaR1QtDnEVeHVxk6Qy2ZwiSCFQSj1+zHqtIqXvmVJJOOo1pY 6N0yglQoKMJdbxcZ8RSwQEnilHoli6AJJHCB8t9A= Message-ID: Subject: Re: [PATCH v3] selinux: measure state and policy capabilities From: James Bottomley To: Paul Moore , Lakshmi Ramasubramanian Cc: zohar@linux.ibm.com, Stephen Smalley , tusharsu@linux.microsoft.com, tyhicks@linux.microsoft.com, casey@schaufler-ca.com, agk@redhat.com, snitzer@redhat.com, gmazyland@gmail.com, sashal@kernel.org, James Morris , linux-integrity@vger.kernel.org, selinux@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Date: Fri, 05 Mar 2021 09:57:42 -0800 In-Reply-To: References: <20210212163709.3139-1-nramas@linux.microsoft.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.4 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2021-03-05 at 12:52 -0500, Paul Moore wrote: [...] > This draft seems fine to me, but there is a small logistical blocker > at the moment which means I can't merge this until -rc2 is released, > which likely means this coming Monday. The problem is that this > patch relies on code that went upstream via in the last merge window > via the IMA tree, not the SELinux tree; normally that wouldn't be a > problem as I typically rebase the selinux/next to Linus' -rc1 tag > once the merge window is closed, but in this particular case the -rc1 > tag is dangerously broken for some system configurations (the tag has > since been renamed) so I'm not rebasing onto -rc1 this time around. > > Assuming that -rc2 fixes the swapfile/fs-corruption problem, early > next week I'll rebase selinux/next to -rc2 and merge this patch. > However, if the swapfile bug continues past -rc2 we can consider > merging this via the IMA tree, but I'd assume not do that if possible > due to merge conflict and testing reasons. If it helps, we rebased the SCSI tree on top of the merge for the swapfile fix which is this one, without waiting for -rc2: commit f69d02e37a85645aa90d18cacfff36dba370f797 Merge: 7a7fd0de4a98 caf6912f3f4a Author: Linus Torvalds Date: Tue Mar 2 18:18:17 2021 -0800 Merge tag 'misc-5.12-2021-03-02' of git://git.kernel.dk/linux-block James