futex: Mark get_robust_list as deprecated

Notify get_robust_list users that the syscall is going away.

commit ec0c4274e33c0373e476b73e01995c53128f1257 upstream

Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Cc: Darren Hart <dvhart@linux.intel.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Serge E. Hallyn <serge.hallyn@canonical.com>
Cc: kernel-hardening@lists.openwall.com
Cc: spender@grsecurity.net
Link: http://lkml.kernel.org/r/20120323190855.GA27213@www.outflux.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Conflicts:

	Documentation/feature-removal-schedule.txt

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index b1c921c27519a0953591b6a64159e46856e7558d..8a65dc1616be0cccc12926194cf14db24f16e5a5 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -605,3 +605,19 @@ Why:       Just opening a V4L device should not change the state of the hardware
 Who:   Hans Verkuil <hans.verkuil@cisco.com>
 
 ----------------------------
+
+What:  kmap_atomic(page, km_type)
+When:  3.5
+Why:   The old kmap_atomic() with two arguments is deprecated, we only
+       keep it for backward compatibility for few cycles and then drop it.
+Who:   Cong Wang <amwang@redhat.com>
+
+----------------------------
+
+What:  get_robust_list syscall
+When:  2013
+Why:   There appear to be no production users of the get_robust_list syscall,
+       and it runs the risk of leaking address locations, allowing the bypass
+       of ASLR. It was only ever intended for debugging, so it should be
+       removed.
+Who:   Kees Cook <keescook@chromium.org>

diff --git a/kernel/futex.c b/kernel/futex.c
index 11e8924b6ee5510a6a49a84c328123b702b17d60..a66214a7a6e60fc35af40d30e57344a7d419b884 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2449,6 +2449,8 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
        if (!futex_cmpxchg_enabled)
                return -ENOSYS;
 
+       WARN_ONCE(1, "deprecated: get_robust_list will be deleted in 2013.\n");
+
        rcu_read_lock();
 
        ret = -ESRCH;

diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
index a9642d528630260749f760f3c02bc8164f51af2b..83e368b005fc6eb001a2babe7a48d80dcb21037e 100644 (file)
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
@@ -142,6 +142,8 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
        if (!futex_cmpxchg_enabled)
                return -ENOSYS;
 
+       WARN_ONCE(1, "deprecated: get_robust_list will be deleted in 2013.\n");
+
        rcu_read_lock();
 
        ret = -ESRCH;