[ 3.5.y.z extended stable ] Patch "futex: Revert "futex: Mark get_robust_list as deprecated"" has been added to staging queue

Luis Henriques luis.henriques at canonical.com
Tue Feb 26 16:14:46 UTC 2013


This is a note to let you know that I have just added a patch titled

    futex: Revert "futex: Mark get_robust_list as deprecated"

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From 6d6038ba2df48d041ca61b45d1db9f0d9cab614a Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx at linutronix.de>
Date: Mon, 18 Feb 2013 09:52:08 +0100
Subject: [PATCH] futex: Revert "futex: Mark get_robust_list as deprecated"

commit fe2b05f7ca9f906be61dced5489f63b8b4d7c770 upstream.

This reverts commit ec0c4274e33c0373e476b73e01995c53128f1257.

get_robust_list() is in use and a removal would break existing user
space. With the permission checks in place it's not longer a security
hole. Remove the deprecation warnings.

Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Cc: Cyrill Gorcunov <gorcunov at openvz.org>
Cc: Richard Weinberger <richard at nod.at>
Cc: akpm at linux-foundation.org
Cc: paul.gortmaker at windriver.com
Cc: davej at redhat.com
Cc: keescook at chromium.org
Cc: ebiederm at xmission.com
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 kernel/futex.c        | 2 --
 kernel/futex_compat.c | 2 --
 2 files changed, 4 deletions(-)

diff --git a/kernel/futex.c b/kernel/futex.c
index 19eb089..8879430 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2471,8 +2471,6 @@ 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 83e368b..a9642d5 100644
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
@@ -142,8 +142,6 @@ 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;
--
1.8.1.2





More information about the kernel-team mailing list