diff options
author | Oleg Nesterov <oleg@redhat.com> | 2014-01-23 18:55:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 19:37:01 -0500 |
commit | 942be3875a1931c379bbc37053829dd6847e0f3f (patch) | |
tree | b601300c01f71ee23f817fa104fc52329ed1d747 /include/linux/sched.h | |
parent | 7288e1187ba935996232246916418c64bb88da30 (diff) |
coredump: make __get_dumpable/get_dumpable inline, kill fs/coredump.h
1. Remove fs/coredump.h. It is not clear why do we need it,
it only declares __get_dumpable(), signal.c includes it
for no reason.
2. Now that get_dumpable() and __get_dumpable() are really
trivial make them inline in linux/sched.h.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: Alex Kelly <alex.page.kelly@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Petr Matousek <pmatouse@redhat.com>
Cc: Vasily Kulikov <segoon@openwall.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 124430ba569b..cf9e414dbb9e 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -391,10 +391,6 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr, | |||
391 | static inline void arch_pick_mmap_layout(struct mm_struct *mm) {} | 391 | static inline void arch_pick_mmap_layout(struct mm_struct *mm) {} |
392 | #endif | 392 | #endif |
393 | 393 | ||
394 | |||
395 | extern void set_dumpable(struct mm_struct *mm, int value); | ||
396 | extern int get_dumpable(struct mm_struct *mm); | ||
397 | |||
398 | #define SUID_DUMP_DISABLE 0 /* No setuid dumping */ | 394 | #define SUID_DUMP_DISABLE 0 /* No setuid dumping */ |
399 | #define SUID_DUMP_USER 1 /* Dump as user of process */ | 395 | #define SUID_DUMP_USER 1 /* Dump as user of process */ |
400 | #define SUID_DUMP_ROOT 2 /* Dump as root */ | 396 | #define SUID_DUMP_ROOT 2 /* Dump as root */ |
@@ -405,6 +401,23 @@ extern int get_dumpable(struct mm_struct *mm); | |||
405 | #define MMF_DUMPABLE_BITS 2 | 401 | #define MMF_DUMPABLE_BITS 2 |
406 | #define MMF_DUMPABLE_MASK ((1 << MMF_DUMPABLE_BITS) - 1) | 402 | #define MMF_DUMPABLE_MASK ((1 << MMF_DUMPABLE_BITS) - 1) |
407 | 403 | ||
404 | extern void set_dumpable(struct mm_struct *mm, int value); | ||
405 | /* | ||
406 | * This returns the actual value of the suid_dumpable flag. For things | ||
407 | * that are using this for checking for privilege transitions, it must | ||
408 | * test against SUID_DUMP_USER rather than treating it as a boolean | ||
409 | * value. | ||
410 | */ | ||
411 | static inline int __get_dumpable(unsigned long mm_flags) | ||
412 | { | ||
413 | return mm_flags & MMF_DUMPABLE_MASK; | ||
414 | } | ||
415 | |||
416 | static inline int get_dumpable(struct mm_struct *mm) | ||
417 | { | ||
418 | return __get_dumpable(mm->flags); | ||
419 | } | ||
420 | |||
408 | /* coredump filter bits */ | 421 | /* coredump filter bits */ |
409 | #define MMF_DUMP_ANON_PRIVATE 2 | 422 | #define MMF_DUMP_ANON_PRIVATE 2 |
410 | #define MMF_DUMP_ANON_SHARED 3 | 423 | #define MMF_DUMP_ANON_SHARED 3 |