Merge tag 'selinux-pr-20190312' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux (fa3d493f) · Commits · 戴 / test

Pull selinux fixes from Paul Moore: "Two small fixes for SELinux in v5.1: one adds a buffer length check to the SELinux SCTP code, the other ensures that the SELinux labeling for a NFS mount is not disabled if the filesystem is mounted twice" * tag 'selinux-pr-20190312' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux: security/selinux: fix SECURITY_LSM_NATIVE_LABELS on reused superblock selinux: add the missing walk_size + len check in selinux_sctp_bind_connect

security/selinux/hooks.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -939,8 +939,11 @@ static int selinux_sb_clone_mnt_opts(const struct super_block *oldsb,
		BUG_ON(!(oldsbsec->flags & SE_SBINITIALIZED));

		/* if fs is reusing a sb, make sure that the contexts match */
		if (newsbsec->flags & SE_SBINITIALIZED)
		if (newsbsec->flags & SE_SBINITIALIZED) {
		if ((kern_flags & SECURITY_LSM_NATIVE_LABELS) && !set_context)
		*set_kern_flags \|= SECURITY_LSM_NATIVE_LABELS;
		return selinux_cmp_sb_context(oldsb, newsb);
		}

		mutex_lock(&newsbsec->lock);

		@@ -5134,6 +5137,9 @@ static int selinux_sctp_bind_connect(struct sock *sk, int optname,
		return -EINVAL;
		}

		if (walk_size + len > addrlen)
		return -EINVAL;

		err = -EINVAL;
		switch (optname) {
		/* Bind checks */

Admin message