From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: "Oleg Nesterov" <oleg@redhat.com>,
"Arve Hjønnevåg" <arve@android.com>,
"Brian Swetland" <swetland@google.com>,
"Greg Kroah-Hartman" <gregkh@suse.de>
Subject: [PATCH 07/10] Staging: android: task_get_unused_fd_flags: fix the wrong usage of tsk->signal
Date: Wed, 28 Jan 2009 15:26:47 -0800 [thread overview]
Message-ID: <1233185210-23098-7-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <20090128232319.GA23009@kroah.com>
From: Oleg Nesterov <oleg@redhat.com>
Compile tested.
task_struct->signal is not protected by RCU, the code is bogus.
Change the code to take ->siglock to pin ->signal.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Arve Hjønnevåg <arve@android.com>
Cc: Brian Swetland <swetland@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/staging/android/binder.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index ab014bc..758131c 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -319,6 +319,7 @@ int task_get_unused_fd_flags(struct task_struct *tsk, int flags)
int fd, error;
struct fdtable *fdt;
unsigned long rlim_cur;
+ unsigned long irqs;
if (files == NULL)
return -ESRCH;
@@ -335,12 +336,11 @@ repeat:
* N.B. For clone tasks sharing a files structure, this test
* will limit the total number of files that can be opened.
*/
- rcu_read_lock();
- if (tsk->signal)
+ rlim_cur = 0;
+ if (lock_task_sighand(tsk, &irqs)) {
rlim_cur = tsk->signal->rlim[RLIMIT_NOFILE].rlim_cur;
- else
- rlim_cur = 0;
- rcu_read_unlock();
+ unlock_task_sighand(tsk, &irqs);
+ }
if (fd >= rlim_cur)
goto out;
--
1.6.0.2
next prev parent reply other threads:[~2009-01-28 23:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-28 23:23 [GIT PATCH] STAGING patches for 2.6-git Greg KH
2009-01-28 23:26 ` [PATCH 01/10] Staging: comedi: fix Kbuild Greg Kroah-Hartman
2009-01-28 23:26 ` [PATCH 02/10] Staging: meilhaus: " Greg Kroah-Hartman
2009-01-28 23:26 ` [PATCH 03/10] Staging: android: binder: fix arm build errors Greg Kroah-Hartman
2009-01-28 23:26 ` [PATCH 04/10] Staging: android: timed_gpio: Fix build to build on kernels after 2.6.25 Greg Kroah-Hartman
2009-01-28 23:26 ` [PATCH 05/10] Staging: android: fix build error on 64bit boxes Greg Kroah-Hartman
2009-01-28 23:26 ` [PATCH 06/10] Staging: android: Add lowmemorykiller documentation Greg Kroah-Hartman
2009-01-28 23:26 ` Greg Kroah-Hartman [this message]
2009-01-28 23:26 ` [PATCH 08/10] staging: agnx: drivers/staging/agnx/agnx.h needs <linux/io.h> Greg Kroah-Hartman
2009-01-28 23:26 ` [PATCH 09/10] Staging: usbip: usbip_start_threads(): handle kernel_thread failure Greg Kroah-Hartman
2009-01-28 23:26 ` [PATCH 10/10] Staging: poch: fix verification of memory area Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1233185210-23098-7-git-send-email-gregkh@suse.de \
--to=gregkh@suse.de \
--cc=arve@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=swetland@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox