Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca2cf054 authored by Jann Horn's avatar Jann Horn Committed by Greg Kroah-Hartman
Browse files

Smack: Don't ignore other bprm->unsafe flags if LSM_UNSAFE_PTRACE is set



commit 3675f052b43ba51b99b85b073c7070e083f3e6fb upstream.

There is a logic bug in the current smack_bprm_set_creds():
If LSM_UNSAFE_PTRACE is set, but the ptrace state is deemed to be
acceptable (e.g. because the ptracer detached in the meantime), the other
->unsafe flags aren't checked. As far as I can tell, this means that
something like the following could work (but I haven't tested it):

 - task A: create task B with fork()
 - task B: set NO_NEW_PRIVS
 - task B: install a seccomp filter that makes open() return 0 under some
   conditions
 - task B: replace fd 0 with a malicious library
 - task A: attach to task B with PTRACE_ATTACH
 - task B: execve() a file with an SMACK64EXEC extended attribute
 - task A: while task B is still in the middle of execve(), exit (which
   destroys the ptrace relationship)

Make sure that if any flags other than LSM_UNSAFE_PTRACE are set in
bprm->unsafe, we reject the execve().

Cc: stable@vger.kernel.org
Fixes: 5663884c ("Smack: unify all ptrace accesses in the smack")
Signed-off-by: default avatarJann Horn <jannh@google.com>
Signed-off-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c8a9950f
Loading
Loading
Loading
Loading
+2 −1
Original line number Original line Diff line number Diff line
@@ -944,7 +944,8 @@ static int smack_bprm_set_creds(struct linux_binprm *bprm)


		if (rc != 0)
		if (rc != 0)
			return rc;
			return rc;
	} else if (bprm->unsafe)
	}
	if (bprm->unsafe & ~LSM_UNSAFE_PTRACE)
		return -EPERM;
		return -EPERM;


	bsp->smk_task = isp->smk_task;
	bsp->smk_task = isp->smk_task;