From patchwork Mon May 17 13:41:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Mosnacek X-Patchwork-Id: 12262003 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=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 9E552C433ED for ; Mon, 17 May 2021 13:42:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7806F60FD8 for ; Mon, 17 May 2021 13:42:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237447AbhEQNnZ (ORCPT ); Mon, 17 May 2021 09:43:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:52480 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237440AbhEQNnZ (ORCPT ); Mon, 17 May 2021 09:43:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621258928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H6x6dlAzQJeEEcgnxw7b14Lv0Ybic0pb80Lf+1COmZk=; b=ZYB1230ie/wvk/sailmmTEoj6+1V/zeFf7QvDGOFS/ueZbIS6A7ME7LWqdj70o5OnIa5/C 6HW+3MuuzbcfXjBVOBzZQzkOLjyYU+OizGXaok3lOAYhbcffD5LihljphMuIacFdaCDLCy fNIKRAxSG4QqSihX0JMJsc2eD3giD0s= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-194-wKoMPhOVPDq-C0ORgAq-vQ-1; Mon, 17 May 2021 09:42:06 -0400 X-MC-Unique: wKoMPhOVPDq-C0ORgAq-vQ-1 Received: by mail-ej1-f72.google.com with SMTP id z6-20020a17090665c6b02903700252d1ccso1054050ejn.10 for ; Mon, 17 May 2021 06:42:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=H6x6dlAzQJeEEcgnxw7b14Lv0Ybic0pb80Lf+1COmZk=; b=BuiWM8jEbuEgymgVRLU8aOp46E/lnUgyNofCbhACN23+pacyS3YmoTFPC7y1cT8I4P UaxI45dbWlBNoee9EUgd58/PFd2h3IfrTU0hBD5GDAEHYUKN+As0dIRS1V+HY1FPfMC1 YsPWwp+sJClxeCL57fz+sHu7FGg0E84ozXM690TMVKFzMsr7NmDH+82405V29mVaiwzu s46vgRD6Kgq7cbv5Kav4fmHufhqWjljcYXjA/Q81LTAtD5M3kynpNoSwRcWbNYnPg5E2 3q5LfVDTR/5aThPSP0mZu+sss6cx4Qjaoj1ezfS5A2cmbmjl+Ln7IFrxb2FZyNaF3RAp as/A== X-Gm-Message-State: AOAM5328BAXpdczOtj6ZGOJDM/fxBqJ2rFwZhyu/8nDIr5tCLOCILzYj YJ0sA4ZizRK4y8EdljAjJgO1n8yosFUj0pZ2f4F5wI8OhzRMN+s6E28eyW0OXmMX5TeFnG6BTJ/ gAzBKWLKRqJ0kkw2kSxRWWJ5nzWO9Lbil6I8ZORFDg0hDjmOuHQITD/0EZ7NlQakdju926M6/Mm wy5OzE2d9mgsMi X-Received: by 2002:a17:907:1007:: with SMTP id ox7mr4490ejb.82.1621258925113; Mon, 17 May 2021 06:42:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOnrwdmJm9wKgv4E3uyq02kBsINeKG2K+kyigE4PMhwjioTBtobRTknqqvWz3J64hwJZiBMw== X-Received: by 2002:a17:907:1007:: with SMTP id ox7mr4465ejb.82.1621258924851; Mon, 17 May 2021 06:42:04 -0700 (PDT) Received: from localhost.localdomain ([2a02:8308:b105:dd00:277b:6436:24db:9466]) by smtp.gmail.com with ESMTPSA id f7sm11302466edd.5.2021.05.17.06.42.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 06:42:04 -0700 (PDT) From: Ondrej Mosnacek To: linux-security-module@vger.kernel.org, selinux@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-btrfs@vger.kernel.org, Paul Moore , Olga Kornievskaia , Al Viro , David Howells , Stephen Smalley , Richard Haines Subject: [PATCH v2 0/2] vfs/security/NFS/btrfs: clean up and fix LSM option handling Date: Mon, 17 May 2021 15:41:59 +0200 Message-Id: <20210517134201.29271-1-omosnace@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=omosnace@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: bulk List-ID: This series fixes two bugs: 1. A bug with BTRFS where LSM options are ignored when BTRFS is mounted via the new fsconfig(2) API. (fixed by patch 1) 2. A bug with NFS + SELinux where an attempt to do the same mount twice might incidentally turn off LSM labeling, making any fresh inode show up as unlabeled. (fixed by patch 2, with patch 1 as a prereq) For bug (1.) I previously posted a different patch [1], which is no longer needed if these patches are applied. While these patches do add a new fs_type flag (which seems to be frowned upon), they also reduce the semantics of FS_BINARY_MOUNT_DATA flag to *only* the mount data being binary, while before it was also (ab)used to skip mount option processing in SELinux for NFS and BTRFS. The result is perhaps still not perfect, but it seems to be the only non-invasive solution for these bugs in the short term. Once BTRFS is finally converted to the new mount API, a lot of the ugliness can likely be refactored to something nicer (and these patches do not really make that any harder to do, IMHO). I tested the patches by running the NFS part of the SELinux testsuite [2] (which is now fully passing). I also ran the proposed BTRFS SELinux test coverage for selinux-testsuite [3], which is now passing. Changes since v1: - in BTRFS, move the FS_HANDLES_LSM_OPTS flag to btrfs_root_fs_type, and remove FS_BINARY_MOUNTDATA from both fs_types now v1: https://lore.kernel.org/selinux/20210409111254.271800-1-omosnace@redhat.com/T/ [1] https://lore.kernel.org/selinux/20210401065403.GA1363493@infradead.org/T/ [2] https://github.com/SELinuxProject/selinux-testsuite/ [3] https://lore.kernel.org/selinux/20201103110121.53919-2-richard_c_haines@btinternet.com/ ^^ the original patch no longer applies - a rebased version is here: https://github.com/WOnder93/selinux-testsuite/commit/212e76b5bd0775c7507c1996bd172de3bcbff139.patch Ondrej Mosnacek (2): vfs,LSM: introduce the FS_HANDLES_LSM_OPTS flag selinux: fix SECURITY_LSM_NATIVE_LABELS flag handling on double mount fs/btrfs/super.c | 34 +++++----------------------------- fs/nfs/fs_context.c | 6 ++++-- fs/super.c | 10 ++++++---- include/linux/fs.h | 3 ++- security/selinux/hooks.c | 32 +++++++++++++++++--------------- 5 files changed, 34 insertions(+), 51 deletions(-)