Commit d049f74f authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds
Browse files

exec/ptrace: fix get_dumpable() incorrect tests 



The get_dumpable() return value is not boolean.  Most users of the
function actually want to be testing for non-SUID_DUMP_USER(1) rather than
SUID_DUMP_DISABLE(0).  The SUID_DUMP_ROOT(2) is also considered a
protected state.  Almost all places did this correctly, excepting the two
places fixed in this patch.

Wrong logic:
    if (dumpable == SUID_DUMP_DISABLE) { /* be protective */ }
        or
    if (dumpable == 0) { /* be protective */ }
        or
    if (!dumpable) { /* be protective */ }

Correct logic:
    if (dumpable != SUID_DUMP_USER) { /* be protective */ }
        or
    if (dumpable != 1) { /* be protective */ }

Without this patch, if the system had set the sysctl fs/suid_dumpable=2, a
user was able to ptrace attach to processes that had dropped privileges to
that user.  (This may have been partially mitigated if Yama was enabled.)

The macros have been moved into the file that declares get/set_dumpable(),
which means things like the ia64 code can see them too.

CVE-2013-2929

Reported-by: default avatarVasily Kulikov <segoon@openwall.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1c3fc3e5

arch/ia64/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ struct thread_struct { 
	regs->loadrs = 0;									\

	regs->r8 = get_dumpable(current->mm);	/* set "don't zap registers" flag */		\

	regs->r12 = new_sp - 16;	/* allocate 16 byte scratch area */			\

	if (unlikely(!get_dumpable(current->mm))) {							\

	if (unlikely(get_dumpable(current->mm) != SUID_DUMP_USER)) {	\

		/*										\

		 * Zap scratch regs to avoid leaking bits between processes with different	\

		 * uid/privileges.								\

fs/exec.c

+6 −0
Original line number Diff line number Diff line
@@ -1669,6 +1669,12 @@ int __get_dumpable(unsigned long mm_flags) 
	return (ret > SUID_DUMP_USER) ? SUID_DUMP_ROOT : ret;

}



/*

 * This returns the actual value of the suid_dumpable flag. For things

 * that are using this for checking for privilege transitions, it must

 * test against SUID_DUMP_USER rather than treating it as a boolean

 * value.

 */

int get_dumpable(struct mm_struct *mm)

{

	return __get_dumpable(mm->flags);

include/linux/binfmts.h

+0 −3
Original line number Diff line number Diff line
@@ -99,9 +99,6 @@ extern void setup_new_exec(struct linux_binprm * bprm); 
extern void would_dump(struct linux_binprm *, struct file *);



extern int suid_dumpable;

#define SUID_DUMP_DISABLE	0	/* No setuid dumping */

#define SUID_DUMP_USER		1	/* Dump as user of process */

#define SUID_DUMP_ROOT		2	/* Dump as root */



/* Stack area protections */

#define EXSTACK_DEFAULT   0	/* Whatever the arch defaults to */

include/linux/sched.h

+4 −0
Original line number Diff line number Diff line
@@ -323,6 +323,10 @@ static inline void arch_pick_mmap_layout(struct mm_struct *mm) {} 
extern void set_dumpable(struct mm_struct *mm, int value);

extern int get_dumpable(struct mm_struct *mm);



#define SUID_DUMP_DISABLE	0	/* No setuid dumping */

#define SUID_DUMP_USER		1	/* Dump as user of process */

#define SUID_DUMP_ROOT		2	/* Dump as root */



/* mm flags */

/* dumpable bits */

#define MMF_DUMPABLE      0  /* core dump is permitted */

kernel/ptrace.c

+2 −1
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ ok: 
	if (task->mm)

		dumpable = get_dumpable(task->mm);

	rcu_read_lock();

	if (!dumpable && !ptrace_has_cap(__task_cred(task)->user_ns, mode)) {

	if (dumpable != SUID_DUMP_USER &&

	    !ptrace_has_cap(__task_cred(task)->user_ns, mode)) {

		rcu_read_unlock();

		return -EPERM;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE