| Message ID | 20210421171446.785507-3-omosnace@redhat.com (mailing list archive) |
|---|---|
| State | Rejected |
| Delegated to: | Paul Moore |
| Headers | show |
| Series | selinux,anon_inodes: Use a separate SELinux class for each type of anon inode | expand |
On Wed, Apr 21, 2021 at 1:14 PM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > Unfortunately, the approach chosen in commit 29cd6591ab6f ("selinux: > teach SELinux about anonymous inodes") to use a single class for all > anon inodes and let the policy distinguish between them using named > transitions turned out to have a rather unfortunate drawback. > > For example, suppose we have two types of anon inodes, "A" and "B", and > we want to allow a set of domains (represented by an attribute "attr_x") > certain set of permissions on anon inodes of type "A" that were created > by the same domain, but at the same time disallow this set to access > anon inodes of type "B" entirely. Since all inodes share the same class > and we want to distinguish both the inode types and the domains that > created them, we have no choice than to create separate types for the > cartesian product of (domains that belong to attr_x) x ("A", "B") and > add all the necessary allow and transition rules for each domain > individually. > > This makes it very impractical to write sane policies for anon inodes in > the future, as more anon inode types are added. Therefore, this patch > implements an alternative approach that assigns a separate class to each > type of anon inode. This allows the example above to be implemented > without any transition rules and with just a single allow rule: > > allow attr_x self:A { ... }; > > In order to not break possible existing users of the already merged > original approach, this patch also adds a new policy capability > "extended_anon_inode_class" that needs to be set by the policy to enable > the new behavior. > > I decided to keep the named transition mechanism in the new variant, > since there might eventually be some extra information in the anon inode > name that could be used in transitions. > > One minor annoyance is that the kernel still expects the policy to > provide both classes (anon_inode and userfaultfd) regardless of the > capability setting and if one of them is not defined in the policy, the > kernel will print a warning when loading the policy. However, it doesn't > seem worth to work around that in the kernel, as the policy can provide > just the definition of the unused class(es) (and permissions) to avoid > this warning. Keeping the legacy anon_inode class with some fallback > rules may also be desirable to keep the policy compatible with kernels > that only support anon_inode. > > Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> NAK. We do not want to introduce a new security class for every user of anon inodes - that isn't what security classes are for. For things like kvm device inodes, those should ultimately use the inherited context from the related inode (the /dev/kvm inode itself). That was the original intent of supporting the related inode. > --- > security/selinux/hooks.c | 27 +++++++++++++++++++++- > security/selinux/include/classmap.h | 2 ++ > security/selinux/include/policycap.h | 1 + > security/selinux/include/policycap_names.h | 3 ++- > security/selinux/include/security.h | 7 ++++++ > 5 files changed, 38 insertions(+), 2 deletions(-) > > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c > index dc57ba21d8ff..20a8d7d17936 100644 > --- a/security/selinux/hooks.c > +++ b/security/selinux/hooks.c > @@ -3079,7 +3079,32 @@ static int selinux_inode_init_security_anon(struct inode *inode, > isec->sclass = context_isec->sclass; > isec->sid = context_isec->sid; > } else { > - isec->sclass = SECCLASS_ANON_INODE; > + /* > + * If the check below fails: > + * 1. Add the corresponding security class to > + * security/selinux/include/classmap.h > + * 2. Map the new LSM_ANON_INODE_* value to the class in > + * the switch statement below. > + * 3. Update the RHS of the comparison in the BUILD_BUG_ON(). > + * 4. CC selinux@vger.kernel.org and > + * linux-security-module@vger.kernel.org when submitting > + * the patch or in case of any questions. > + */ > + BUILD_BUG_ON(LSM_ANON_INODE_MAX > LSM_ANON_INODE_USERFAULTFD); > + > + if (selinux_policycap_extended_anon_inode()) { > + switch (type) { > + case LSM_ANON_INODE_USERFAULTFD: > + isec->sclass = SECCLASS_USERFAULTFD; > + break; > + default: > + pr_err("SELinux: got invalid anon inode type: %d", > + (int)type); > + return -EINVAL; > + } > + } else { > + isec->sclass = SECCLASS_ANON_INODE; > + } > rc = security_transition_sid( > &selinux_state, tsec->sid, tsec->sid, > isec->sclass, name, &isec->sid); > diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h > index ba2e01a6955c..e4308cad6407 100644 > --- a/security/selinux/include/classmap.h > +++ b/security/selinux/include/classmap.h > @@ -251,6 +251,8 @@ struct security_class_mapping secclass_map[] = { > { "integrity", "confidentiality", NULL } }, > { "anon_inode", > { COMMON_FILE_PERMS, NULL } }, > + { "userfaultfd", > + { COMMON_FILE_PERMS, NULL } }, > { NULL } > }; > > diff --git a/security/selinux/include/policycap.h b/security/selinux/include/policycap.h > index 2ec038efbb03..969804bd6dab 100644 > --- a/security/selinux/include/policycap.h > +++ b/security/selinux/include/policycap.h > @@ -11,6 +11,7 @@ enum { > POLICYDB_CAPABILITY_CGROUPSECLABEL, > POLICYDB_CAPABILITY_NNP_NOSUID_TRANSITION, > POLICYDB_CAPABILITY_GENFS_SECLABEL_SYMLINKS, > + POLICYDB_CAPABILITY_EXTENDED_ANON_INODE_CLASS, > __POLICYDB_CAPABILITY_MAX > }; > #define POLICYDB_CAPABILITY_MAX (__POLICYDB_CAPABILITY_MAX - 1) > diff --git a/security/selinux/include/policycap_names.h b/security/selinux/include/policycap_names.h > index b89289f092c9..78651990425e 100644 > --- a/security/selinux/include/policycap_names.h > +++ b/security/selinux/include/policycap_names.h > @@ -12,7 +12,8 @@ const char *selinux_policycap_names[__POLICYDB_CAPABILITY_MAX] = { > "always_check_network", > "cgroup_seclabel", > "nnp_nosuid_transition", > - "genfs_seclabel_symlinks" > + "genfs_seclabel_symlinks", > + "extended_anon_inode_class", > }; > > #endif /* _SELINUX_POLICYCAP_NAMES_H_ */ > diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h > index 7130c9648ad1..4fb75101aca4 100644 > --- a/security/selinux/include/security.h > +++ b/security/selinux/include/security.h > @@ -219,6 +219,13 @@ static inline bool selinux_policycap_genfs_seclabel_symlinks(void) > return READ_ONCE(state->policycap[POLICYDB_CAPABILITY_GENFS_SECLABEL_SYMLINKS]); > } > > +static inline bool selinux_policycap_extended_anon_inode(void) > +{ > + struct selinux_state *state = &selinux_state; > + > + return READ_ONCE(state->policycap[POLICYDB_CAPABILITY_EXTENDED_ANON_INODE_CLASS]); > +} > + > int security_mls_enabled(struct selinux_state *state); > int security_load_policy(struct selinux_state *state, > void *data, size_t len, > -- > 2.30.2 >
On Thu, Apr 22, 2021 at 3:21 PM Stephen Smalley <stephen.smalley.work@gmail.com> wrote: > On Wed, Apr 21, 2021 at 1:14 PM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > > > Unfortunately, the approach chosen in commit 29cd6591ab6f ("selinux: > > teach SELinux about anonymous inodes") to use a single class for all > > anon inodes and let the policy distinguish between them using named > > transitions turned out to have a rather unfortunate drawback. > > > > For example, suppose we have two types of anon inodes, "A" and "B", and > > we want to allow a set of domains (represented by an attribute "attr_x") > > certain set of permissions on anon inodes of type "A" that were created > > by the same domain, but at the same time disallow this set to access > > anon inodes of type "B" entirely. Since all inodes share the same class > > and we want to distinguish both the inode types and the domains that > > created them, we have no choice than to create separate types for the > > cartesian product of (domains that belong to attr_x) x ("A", "B") and > > add all the necessary allow and transition rules for each domain > > individually. > > > > This makes it very impractical to write sane policies for anon inodes in > > the future, as more anon inode types are added. Therefore, this patch > > implements an alternative approach that assigns a separate class to each > > type of anon inode. This allows the example above to be implemented > > without any transition rules and with just a single allow rule: > > > > allow attr_x self:A { ... }; > > > > In order to not break possible existing users of the already merged > > original approach, this patch also adds a new policy capability > > "extended_anon_inode_class" that needs to be set by the policy to enable > > the new behavior. > > > > I decided to keep the named transition mechanism in the new variant, > > since there might eventually be some extra information in the anon inode > > name that could be used in transitions. > > > > One minor annoyance is that the kernel still expects the policy to > > provide both classes (anon_inode and userfaultfd) regardless of the > > capability setting and if one of them is not defined in the policy, the > > kernel will print a warning when loading the policy. However, it doesn't > > seem worth to work around that in the kernel, as the policy can provide > > just the definition of the unused class(es) (and permissions) to avoid > > this warning. Keeping the legacy anon_inode class with some fallback > > rules may also be desirable to keep the policy compatible with kernels > > that only support anon_inode. > > > > Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> > > NAK. We do not want to introduce a new security class for every user > of anon inodes - that isn't what security classes are for. > For things like kvm device inodes, those should ultimately use the > inherited context from the related inode (the /dev/kvm inode itself). > That was the original intent of supporting the related inode. Hmm, so are you implying that anon inodes should be thought of the same as control /dev nodes? I.e. that even though there may be many one-time actual inodes created by different processes, they should be thought of as a single "static interface" to the respective kernel functionality? That would justify having a common type/label for all of them, but I'm not sure if it doesn't open some gap due to the possibility to pass the associated file descriptors between processes (as AFAIK, these can hold some context)... I thought this was supposed to resemble more the way BPF, perf_event, etc. support was implemented - the BPF and perf_event fds are also anon inodes under the hood, BTW - where each file descriptor is considered a separate object that inherits the label of its creator and there is some class separation (e.g. bpf vs. perf_event). -- Ondrej Mosnacek Software Engineer, Linux Security - SELinux kernel Red Hat, Inc.
On Fri, Apr 23, 2021 at 9:41 AM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > On Thu, Apr 22, 2021 at 3:21 PM Stephen Smalley > <stephen.smalley.work@gmail.com> wrote: > > On Wed, Apr 21, 2021 at 1:14 PM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > > > > > Unfortunately, the approach chosen in commit 29cd6591ab6f ("selinux: > > > teach SELinux about anonymous inodes") to use a single class for all > > > anon inodes and let the policy distinguish between them using named > > > transitions turned out to have a rather unfortunate drawback. > > > > > > For example, suppose we have two types of anon inodes, "A" and "B", and > > > we want to allow a set of domains (represented by an attribute "attr_x") > > > certain set of permissions on anon inodes of type "A" that were created > > > by the same domain, but at the same time disallow this set to access > > > anon inodes of type "B" entirely. Since all inodes share the same class > > > and we want to distinguish both the inode types and the domains that > > > created them, we have no choice than to create separate types for the > > > cartesian product of (domains that belong to attr_x) x ("A", "B") and > > > add all the necessary allow and transition rules for each domain > > > individually. > > > > > > This makes it very impractical to write sane policies for anon inodes in > > > the future, as more anon inode types are added. Therefore, this patch > > > implements an alternative approach that assigns a separate class to each > > > type of anon inode. This allows the example above to be implemented > > > without any transition rules and with just a single allow rule: > > > > > > allow attr_x self:A { ... }; > > > > > > In order to not break possible existing users of the already merged > > > original approach, this patch also adds a new policy capability > > > "extended_anon_inode_class" that needs to be set by the policy to enable > > > the new behavior. > > > > > > I decided to keep the named transition mechanism in the new variant, > > > since there might eventually be some extra information in the anon inode > > > name that could be used in transitions. > > > > > > One minor annoyance is that the kernel still expects the policy to > > > provide both classes (anon_inode and userfaultfd) regardless of the > > > capability setting and if one of them is not defined in the policy, the > > > kernel will print a warning when loading the policy. However, it doesn't > > > seem worth to work around that in the kernel, as the policy can provide > > > just the definition of the unused class(es) (and permissions) to avoid > > > this warning. Keeping the legacy anon_inode class with some fallback > > > rules may also be desirable to keep the policy compatible with kernels > > > that only support anon_inode. > > > > > > Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> > > > > NAK. We do not want to introduce a new security class for every user > > of anon inodes - that isn't what security classes are for. > > For things like kvm device inodes, those should ultimately use the > > inherited context from the related inode (the /dev/kvm inode itself). > > That was the original intent of supporting the related inode. > > Hmm, so are you implying that anon inodes should be thought of the > same as control /dev nodes? I.e. that even though there may be many > one-time actual inodes created by different processes, they should be > thought of as a single "static interface" to the respective kernel > functionality? That would justify having a common type/label for all > of them, but I'm not sure if it doesn't open some gap due to the > possibility to pass the associated file descriptors between processes > (as AFAIK, these can hold some context)... That was the original design (and the original patchset that we posted in parallel with Google's independently developed one). We even had example policy/controls for /dev/kvm ioctls. Imagine trying to write policy over /dev/kvm ioctls where you have to deal with N different classes and/or types and remember which ioctl commands are exercised on which class or type even though from the users' perspective they all occurred through the /dev/kvm interface. It seemed super fragile and difficult to maintain/analyze that way. Versus writing a single allow rule for all /dev/kvm ioctls. I guess we could discuss the alternatives but please have a look at those original patches and examples. If we go down this road, we need some way to deal with scaling because we only have a limited number of discrete classes available to us and potentially unbounded set of distinct anon inode users (although hopefully in practice only a few that we care about distinguishing). > I thought this was supposed to resemble more the way BPF, perf_event, > etc. support was implemented - the BPF and perf_event fds are also > anon inodes under the hood, BTW - where each file descriptor is > considered a separate object that inherits the label of its creator > and there is some class separation (e.g. bpf vs. perf_event).
On Fri, Apr 23, 2021 at 10:22 AM Stephen Smalley <stephen.smalley.work@gmail.com> wrote: > > On Fri, Apr 23, 2021 at 9:41 AM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > > > On Thu, Apr 22, 2021 at 3:21 PM Stephen Smalley > > <stephen.smalley.work@gmail.com> wrote: > > > On Wed, Apr 21, 2021 at 1:14 PM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > > > > > > > Unfortunately, the approach chosen in commit 29cd6591ab6f ("selinux: > > > > teach SELinux about anonymous inodes") to use a single class for all > > > > anon inodes and let the policy distinguish between them using named > > > > transitions turned out to have a rather unfortunate drawback. > > > > > > > > For example, suppose we have two types of anon inodes, "A" and "B", and > > > > we want to allow a set of domains (represented by an attribute "attr_x") > > > > certain set of permissions on anon inodes of type "A" that were created > > > > by the same domain, but at the same time disallow this set to access > > > > anon inodes of type "B" entirely. Since all inodes share the same class > > > > and we want to distinguish both the inode types and the domains that > > > > created them, we have no choice than to create separate types for the > > > > cartesian product of (domains that belong to attr_x) x ("A", "B") and > > > > add all the necessary allow and transition rules for each domain > > > > individually. > > > > > > > > This makes it very impractical to write sane policies for anon inodes in > > > > the future, as more anon inode types are added. Therefore, this patch > > > > implements an alternative approach that assigns a separate class to each > > > > type of anon inode. This allows the example above to be implemented > > > > without any transition rules and with just a single allow rule: > > > > > > > > allow attr_x self:A { ... }; > > > > > > > > In order to not break possible existing users of the already merged > > > > original approach, this patch also adds a new policy capability > > > > "extended_anon_inode_class" that needs to be set by the policy to enable > > > > the new behavior. > > > > > > > > I decided to keep the named transition mechanism in the new variant, > > > > since there might eventually be some extra information in the anon inode > > > > name that could be used in transitions. > > > > > > > > One minor annoyance is that the kernel still expects the policy to > > > > provide both classes (anon_inode and userfaultfd) regardless of the > > > > capability setting and if one of them is not defined in the policy, the > > > > kernel will print a warning when loading the policy. However, it doesn't > > > > seem worth to work around that in the kernel, as the policy can provide > > > > just the definition of the unused class(es) (and permissions) to avoid > > > > this warning. Keeping the legacy anon_inode class with some fallback > > > > rules may also be desirable to keep the policy compatible with kernels > > > > that only support anon_inode. > > > > > > > > Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> > > > > > > NAK. We do not want to introduce a new security class for every user > > > of anon inodes - that isn't what security classes are for. > > > For things like kvm device inodes, those should ultimately use the > > > inherited context from the related inode (the /dev/kvm inode itself). > > > That was the original intent of supporting the related inode. > > > > Hmm, so are you implying that anon inodes should be thought of the > > same as control /dev nodes? I.e. that even though there may be many > > one-time actual inodes created by different processes, they should be > > thought of as a single "static interface" to the respective kernel > > functionality? That would justify having a common type/label for all > > of them, but I'm not sure if it doesn't open some gap due to the > > possibility to pass the associated file descriptors between processes > > (as AFAIK, these can hold some context)... > > That was the original design (and the original patchset that we posted > in parallel with Google's independently developed one). We even had > example policy/controls for /dev/kvm ioctls. > Imagine trying to write policy over /dev/kvm ioctls where you have to > deal with N different classes and/or types and remember which ioctl > commands are exercised on which class or type even though from the > users' perspective they all occurred through the /dev/kvm interface. > It seemed super fragile and difficult to maintain/analyze that way. > Versus writing a single allow rule for all /dev/kvm ioctls. > > I guess we could discuss the alternatives but please have a look at > those original patches and examples. If we go down this road, we need > some way to deal with scaling because we only have a limited number of > discrete classes available to us and potentially unbounded set of > distinct anon inode users (although hopefully in practice only a few > that we care about distinguishing). Actually, on second thought, we shouldn't be in any danger of running out of classes so nevermind on that point. > > > I thought this was supposed to resemble more the way BPF, perf_event, > > etc. support was implemented - the BPF and perf_event fds are also > > anon inodes under the hood, BTW - where each file descriptor is > > considered a separate object that inherits the label of its creator > > and there is some class separation (e.g. bpf vs. perf_event).
On Fri, Apr 23, 2021 at 5:20 PM Stephen Smalley <stephen.smalley.work@gmail.com> wrote: > On Fri, Apr 23, 2021 at 10:22 AM Stephen Smalley > <stephen.smalley.work@gmail.com> wrote: > > > > On Fri, Apr 23, 2021 at 9:41 AM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > > > > > On Thu, Apr 22, 2021 at 3:21 PM Stephen Smalley > > > <stephen.smalley.work@gmail.com> wrote: > > > > On Wed, Apr 21, 2021 at 1:14 PM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > > > > > > > > > Unfortunately, the approach chosen in commit 29cd6591ab6f ("selinux: > > > > > teach SELinux about anonymous inodes") to use a single class for all > > > > > anon inodes and let the policy distinguish between them using named > > > > > transitions turned out to have a rather unfortunate drawback. > > > > > > > > > > For example, suppose we have two types of anon inodes, "A" and "B", and > > > > > we want to allow a set of domains (represented by an attribute "attr_x") > > > > > certain set of permissions on anon inodes of type "A" that were created > > > > > by the same domain, but at the same time disallow this set to access > > > > > anon inodes of type "B" entirely. Since all inodes share the same class > > > > > and we want to distinguish both the inode types and the domains that > > > > > created them, we have no choice than to create separate types for the > > > > > cartesian product of (domains that belong to attr_x) x ("A", "B") and > > > > > add all the necessary allow and transition rules for each domain > > > > > individually. > > > > > > > > > > This makes it very impractical to write sane policies for anon inodes in > > > > > the future, as more anon inode types are added. Therefore, this patch > > > > > implements an alternative approach that assigns a separate class to each > > > > > type of anon inode. This allows the example above to be implemented > > > > > without any transition rules and with just a single allow rule: > > > > > > > > > > allow attr_x self:A { ... }; > > > > > > > > > > In order to not break possible existing users of the already merged > > > > > original approach, this patch also adds a new policy capability > > > > > "extended_anon_inode_class" that needs to be set by the policy to enable > > > > > the new behavior. > > > > > > > > > > I decided to keep the named transition mechanism in the new variant, > > > > > since there might eventually be some extra information in the anon inode > > > > > name that could be used in transitions. > > > > > > > > > > One minor annoyance is that the kernel still expects the policy to > > > > > provide both classes (anon_inode and userfaultfd) regardless of the > > > > > capability setting and if one of them is not defined in the policy, the > > > > > kernel will print a warning when loading the policy. However, it doesn't > > > > > seem worth to work around that in the kernel, as the policy can provide > > > > > just the definition of the unused class(es) (and permissions) to avoid > > > > > this warning. Keeping the legacy anon_inode class with some fallback > > > > > rules may also be desirable to keep the policy compatible with kernels > > > > > that only support anon_inode. > > > > > > > > > > Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> > > > > > > > > NAK. We do not want to introduce a new security class for every user > > > > of anon inodes - that isn't what security classes are for. > > > > For things like kvm device inodes, those should ultimately use the > > > > inherited context from the related inode (the /dev/kvm inode itself). > > > > That was the original intent of supporting the related inode. > > > > > > Hmm, so are you implying that anon inodes should be thought of the > > > same as control /dev nodes? I.e. that even though there may be many > > > one-time actual inodes created by different processes, they should be > > > thought of as a single "static interface" to the respective kernel > > > functionality? That would justify having a common type/label for all > > > of them, but I'm not sure if it doesn't open some gap due to the > > > possibility to pass the associated file descriptors between processes > > > (as AFAIK, these can hold some context)... > > > > That was the original design (and the original patchset that we posted > > in parallel with Google's independently developed one). We even had > > example policy/controls for /dev/kvm ioctls. > > Imagine trying to write policy over /dev/kvm ioctls where you have to > > deal with N different classes and/or types and remember which ioctl > > commands are exercised on which class or type even though from the > > users' perspective they all occurred through the /dev/kvm interface. > > It seemed super fragile and difficult to maintain/analyze that way. > > Versus writing a single allow rule for all /dev/kvm ioctls. So I went back and read the conversations on the original patches and after thinking a bit more about it I'm getting more comfortable with the idea to treat anonymous inodes as a kind of opened device node file (which can be either an "imaginary" one as in the userfaultfd(2) case or an existing real device node as in the KVM example), which has just one type regardless of what process has created it. I suppose if there are any properties of an open anonymous inode that would be interesting from SELinux POV, they could be checked via a separate class with an appropriate permission. For example, if we wanted to control which domains can create & use usefaultfds without vs. with the UFFD_USER_MODE_ONLY flag, we could introduce a new hook, which would allow us to check an access vector like (current_sid, current_sid, userfaultfd, kernel_mode) on any attempt to create or inherit/receive an uffd without the UFFD_USER_MODE_ONLY flag. (In fact, this might actually be a useful enhancement...) So I'm retracting these patches for now. > > > > I guess we could discuss the alternatives but please have a look at > > those original patches and examples. If we go down this road, we need > > some way to deal with scaling because we only have a limited number of > > discrete classes available to us and potentially unbounded set of > > distinct anon inode users (although hopefully in practice only a few > > that we care about distinguishing). > > Actually, on second thought, we shouldn't be in any danger of running > out of classes so nevermind on that point. > > > > > > I thought this was supposed to resemble more the way BPF, perf_event, > > > etc. support was implemented - the BPF and perf_event fds are also > > > anon inodes under the hood, BTW - where each file descriptor is > > > considered a separate object that inherits the label of its creator > > > and there is some class separation (e.g. bpf vs. perf_event). -- Ondrej Mosnacek Software Engineer, Linux Security - SELinux kernel Red Hat, Inc.
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index dc57ba21d8ff..20a8d7d17936 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -3079,7 +3079,32 @@ static int selinux_inode_init_security_anon(struct inode *inode, isec->sclass = context_isec->sclass; isec->sid = context_isec->sid; } else { - isec->sclass = SECCLASS_ANON_INODE; + /* + * If the check below fails: + * 1. Add the corresponding security class to + * security/selinux/include/classmap.h + * 2. Map the new LSM_ANON_INODE_* value to the class in + * the switch statement below. + * 3. Update the RHS of the comparison in the BUILD_BUG_ON(). + * 4. CC selinux@vger.kernel.org and + * linux-security-module@vger.kernel.org when submitting + * the patch or in case of any questions. + */ + BUILD_BUG_ON(LSM_ANON_INODE_MAX > LSM_ANON_INODE_USERFAULTFD); + + if (selinux_policycap_extended_anon_inode()) { + switch (type) { + case LSM_ANON_INODE_USERFAULTFD: + isec->sclass = SECCLASS_USERFAULTFD; + break; + default: + pr_err("SELinux: got invalid anon inode type: %d", + (int)type); + return -EINVAL; + } + } else { + isec->sclass = SECCLASS_ANON_INODE; + } rc = security_transition_sid( &selinux_state, tsec->sid, tsec->sid, isec->sclass, name, &isec->sid); diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h index ba2e01a6955c..e4308cad6407 100644 --- a/security/selinux/include/classmap.h +++ b/security/selinux/include/classmap.h @@ -251,6 +251,8 @@ struct security_class_mapping secclass_map[] = { { "integrity", "confidentiality", NULL } }, { "anon_inode", { COMMON_FILE_PERMS, NULL } }, + { "userfaultfd", + { COMMON_FILE_PERMS, NULL } }, { NULL } }; diff --git a/security/selinux/include/policycap.h b/security/selinux/include/policycap.h index 2ec038efbb03..969804bd6dab 100644 --- a/security/selinux/include/policycap.h +++ b/security/selinux/include/policycap.h @@ -11,6 +11,7 @@ enum { POLICYDB_CAPABILITY_CGROUPSECLABEL, POLICYDB_CAPABILITY_NNP_NOSUID_TRANSITION, POLICYDB_CAPABILITY_GENFS_SECLABEL_SYMLINKS, + POLICYDB_CAPABILITY_EXTENDED_ANON_INODE_CLASS, __POLICYDB_CAPABILITY_MAX }; #define POLICYDB_CAPABILITY_MAX (__POLICYDB_CAPABILITY_MAX - 1) diff --git a/security/selinux/include/policycap_names.h b/security/selinux/include/policycap_names.h index b89289f092c9..78651990425e 100644 --- a/security/selinux/include/policycap_names.h +++ b/security/selinux/include/policycap_names.h @@ -12,7 +12,8 @@ const char *selinux_policycap_names[__POLICYDB_CAPABILITY_MAX] = { "always_check_network", "cgroup_seclabel", "nnp_nosuid_transition", - "genfs_seclabel_symlinks" + "genfs_seclabel_symlinks", + "extended_anon_inode_class", }; #endif /* _SELINUX_POLICYCAP_NAMES_H_ */ diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index 7130c9648ad1..4fb75101aca4 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h @@ -219,6 +219,13 @@ static inline bool selinux_policycap_genfs_seclabel_symlinks(void) return READ_ONCE(state->policycap[POLICYDB_CAPABILITY_GENFS_SECLABEL_SYMLINKS]); } +static inline bool selinux_policycap_extended_anon_inode(void) +{ + struct selinux_state *state = &selinux_state; + + return READ_ONCE(state->policycap[POLICYDB_CAPABILITY_EXTENDED_ANON_INODE_CLASS]); +} + int security_mls_enabled(struct selinux_state *state); int security_load_policy(struct selinux_state *state, void *data, size_t len,
Unfortunately, the approach chosen in commit 29cd6591ab6f ("selinux: teach SELinux about anonymous inodes") to use a single class for all anon inodes and let the policy distinguish between them using named transitions turned out to have a rather unfortunate drawback. For example, suppose we have two types of anon inodes, "A" and "B", and we want to allow a set of domains (represented by an attribute "attr_x") certain set of permissions on anon inodes of type "A" that were created by the same domain, but at the same time disallow this set to access anon inodes of type "B" entirely. Since all inodes share the same class and we want to distinguish both the inode types and the domains that created them, we have no choice than to create separate types for the cartesian product of (domains that belong to attr_x) x ("A", "B") and add all the necessary allow and transition rules for each domain individually. This makes it very impractical to write sane policies for anon inodes in the future, as more anon inode types are added. Therefore, this patch implements an alternative approach that assigns a separate class to each type of anon inode. This allows the example above to be implemented without any transition rules and with just a single allow rule: allow attr_x self:A { ... }; In order to not break possible existing users of the already merged original approach, this patch also adds a new policy capability "extended_anon_inode_class" that needs to be set by the policy to enable the new behavior. I decided to keep the named transition mechanism in the new variant, since there might eventually be some extra information in the anon inode name that could be used in transitions. One minor annoyance is that the kernel still expects the policy to provide both classes (anon_inode and userfaultfd) regardless of the capability setting and if one of them is not defined in the policy, the kernel will print a warning when loading the policy. However, it doesn't seem worth to work around that in the kernel, as the policy can provide just the definition of the unused class(es) (and permissions) to avoid this warning. Keeping the legacy anon_inode class with some fallback rules may also be desirable to keep the policy compatible with kernels that only support anon_inode. Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> --- security/selinux/hooks.c | 27 +++++++++++++++++++++- security/selinux/include/classmap.h | 2 ++ security/selinux/include/policycap.h | 1 + security/selinux/include/policycap_names.h | 3 ++- security/selinux/include/security.h | 7 ++++++ 5 files changed, 38 insertions(+), 2 deletions(-)