Patch "selinux: Remove redundant check for unknown labeling behavior" has been added to the 4.4-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
selinux: Remove redundant check for unknown labeling behavior
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
selinux-remove-redundant-check-for-unknown-labeling-behavior.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
270e8573145a26de924e2dc644596332d400445bMon Sep 17 00:00:00 2001
From: Matthias Kaehlcke <[email protected]>
Date: Fri, 19 May 2017 10:09:32 -0700
Subject: selinux: Remove redundant check for unknown labeling behavior
From: Matthias Kaehlcke <[email protected]>
commit 270e8573145a26de924e2dc644596332d400445b upstream.
The check is already performed in ocontext_read() when the policy is loaded. Removing the array also fixes the following warning when building with clang:
security/selinux/hooks.c:338:20: error: variable 'labeling_behaviors'
is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration]
--- security/selinux/hooks.c | 16 ---------------- 1 file changed, 16 deletions(-)
security/selinux/hooks.c +0 -16
@@ -333,18 +333,6 @@ static void superblock_free_security(strkfree (sbsec); } -/* The file system's label must be initialized prior to use. */ - -static const char *labeling_behaviors[7 ] = { -"uses xattr" , -"uses transition SIDs" , -"uses task SIDs" , -"uses genfs_contexts" , -"not configured for labeling" , -"uses mountpoint labeling" , -"uses native labeling" , -}; -static int inode_doinit_with_dentry (struct inode *inode,struct dentry *opt_dentry);static inline int inode_doinit (struct inode *inode)
@@ -456,10 +444,6 @@ static int sb_finish_set_opts(struct sup } } -if (sbsec->behavior >ARRAY_SIZE (labeling_behaviors)) -printk (KERN_ERR "SELinux: initialized (dev %s, type %s), unknown behavior\n" , - sb->s_id, sb->s_type->name); - sbsec->flags |=SE_SBINITIALIZED ;if (selinux_is_sblabel_mnt (sb)) sbsec->flags |=SBLABEL_MNT ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/dm-ioctl-remove-double-parentheses.patch queue-4.4/arm64-avoid-overflow-in-va_start-and-page_offset.patch queue-4.4/genirq-use-cpumask_available-for-check-of-cpumask-variable.patch queue-4.4/selinux-remove-redundant-check-for-unknown-labeling-behavior.patch queue-4.4/fs-compat-remove-warning-from-compatible_ioctl.patch queue-4.4/jiffies.h-declare-jiffies-and-jiffies_64-with-____cacheline_aligned_in_smp.patch queue-4.4/selinux-remove-unnecessary-check-of-array-base-in-selinux_set_mapping.patch queue-4.4/pci-make-pci_rom_address_mask-a-32-bit-constant.patch queue-4.4/frv-declare-jiffies-to-be-located-in-the-.data-section.patch queue-4.4/netfilter-ctnetlink-make-some-parameters-integer-to-avoid-enum-mismatch.patch queue-4.4/cpumask-add-helper-cpumask_available.patch