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=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL 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 C0E5FC352A3 for ; Thu, 6 Feb 2020 21:17:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 946BF21775 for ; Thu, 6 Feb 2020 21:17:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="vP4Bf8wH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727542AbgBFVRX (ORCPT ); Thu, 6 Feb 2020 16:17:23 -0500 Received: from mail-pg1-f201.google.com ([209.85.215.201]:44450 "EHLO mail-pg1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726765AbgBFVRX (ORCPT ); Thu, 6 Feb 2020 16:17:23 -0500 Received: by mail-pg1-f201.google.com with SMTP id o21so137781pgm.11 for ; Thu, 06 Feb 2020 13:17:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=6zFcQXxOd0AoSDoUqg6z5isQ/0sW7jX3LPLgTPoylbY=; b=vP4Bf8wHbtqzl59NmCRJTaPR2n5wX4ZSrXrJNID22SE8DI55UfIBhBJh3luYclTmHA 6e1aPnCGZt9aluu6/yuB4QOEGRi/vd75bY80CqYK3NRmimEjHTd44VL3InyfFxAtRbWr Nppf17834U0//WH8jjkqkffz9CpSvfJF+l2cXIm6iUbiIME2GoY9N1rbEKsmaHTyOYRU TWkJVCvaFoHovqGTp/ssYzmB2KYd3cRJRpIbl8BFSxCOgriT7scP7xKCnjCZvzv4VyWo nKLuBdDmjP7JKyEGSVXIE8rBuHZzDdY7BVR5GAiYJ40PBmjje8DTZ0j1t60/jJN4wh1F BxuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=6zFcQXxOd0AoSDoUqg6z5isQ/0sW7jX3LPLgTPoylbY=; b=JYK6WHOUn+/bCTGEV0s4lImpl2xpoDmGL32Tz01MAr+F3vGoBv+/DX0KoXiZ0Xks3J 0JSLltpaxJIpLMBju2OWWQwirrE3v0KjbwyGI7BL2Ff0bGCakILiXeExQXZpt7ogdZP9 9fsjOjkXqpUXzuM8+sl+cUKdH+TGoCGa9UfRqpbvupvdV0bFIFTFeLOGB3oAGF8yB8PH HP8lE/U0VGjbPVSWo6Oj7bstfZW4JcRuf7wWSOgLoejgOAOcWCuL3gddxLpMndHRJ9ab S5JoZQdXC6fMUE14NpcG1sLMJCIF/AiK3eccVn2nOmHnApscpsSpCQ+OwWZ2O2dS3flO sqBw== X-Gm-Message-State: APjAAAUitSEbnaCYzcyiknHGJ0833ZqRgopuFqeT6ZsR9FC/4DT4GvEm WWPT+s8OvfBQoDo2o1THzB7DRYRMQVUm/Uw= X-Google-Smtp-Source: APXvYqzPVS9brXynVC6CJDUEfyYzzmFRTdnK/23UvbznArAKwqWH9tbV7OeVpsvavmtAlSJC0jjyrYSMAAOSKRo= X-Received: by 2002:a63:381a:: with SMTP id f26mr6083736pga.40.1581023841400; Thu, 06 Feb 2020 13:17:21 -0800 (PST) Date: Thu, 6 Feb 2020 13:14:31 -0800 Message-Id: <20200206211430.150615-1-smoreland@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog Subject: [PATCH v2] security: selinux: allow per-file labeling for bpffs From: Steven Moreland To: paul@paul-moore.com, sds@tycho.nsa.gov, eparis@parisplace.org, keescook@chromium.org, anton@enomsg.org, ccross@android.com, tony.luck@intel.com, selinux@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@android.com Cc: "Connor O'Brien" , Steven Moreland Content-Type: text/plain; charset="UTF-8" Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org From: Connor O'Brien Add support for genfscon per-file labeling of bpffs files. This allows for separate permissions for different pinned bpf objects, which may be completely unrelated to each other. Signed-off-by: Connor O'Brien Signed-off-by: Steven Moreland --- security/selinux/hooks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 116b4d644f68..d7b11188dc8d 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -750,7 +750,8 @@ static int selinux_set_mnt_opts(struct super_block *sb, if (strcmp(sb->s_type->name, "proc") == 0) sbsec->flags |= SE_SBPROC | SE_SBGENFS; - if (!strcmp(sb->s_type->name, "debugfs") || + if (!strcmp(sb->s_type->name, "bpf") || + !strcmp(sb->s_type->name, "debugfs") || !strcmp(sb->s_type->name, "tracefs") || !strcmp(sb->s_type->name, "pstore")) sbsec->flags |= SE_SBGENFS; -- 2.25.0.341.g760bfbb309-goog v1 -> v2 - Rebased to be on upstream selinux tree - Removed Android specific 'Change-Id'