aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-02-12 03:52:58 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 12:48:32 -0500
commit3e7cd6c413c9e6fbb5e1ee2acdadb4ababd2d474 (patch)
treede97d00794ee0c787b6c551a91e33fb1faa48caa /drivers
parent0475ac0845f9295bc5f69af45f58dff2c104c8d1 (diff)
[PATCH] pid: replace is_orphaned_pgrp with is_current_pgrp_orphaned
Every call to is_orphaned_pgrp passed in process_group(current) which is racy with respect to another thread changing our process group. It didn't bite us because we were dealing with integers and the worse we would get would be a stale answer. In switching the checks to use struct pid to be a little more efficient and prepare the way for pid namespaces this race became apparent. So I simplified the calls to the more specialized is_current_pgrp_orphaned so I didn't have to worry about making logic changes to avoid the race. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/n_tty.c2
-rw-r--r--drivers/char/tty_io.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index 2bdb0144a22e..c035c2f1f462 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -1188,7 +1188,7 @@ static int job_control(struct tty_struct *tty, struct file *file)
1188 printk("read_chan: tty->pgrp <= 0!\n"); 1188 printk("read_chan: tty->pgrp <= 0!\n");
1189 else if (process_group(current) != tty->pgrp) { 1189 else if (process_group(current) != tty->pgrp) {
1190 if (is_ignored(SIGTTIN) || 1190 if (is_ignored(SIGTTIN) ||
1191 is_orphaned_pgrp(process_group(current))) 1191 is_current_pgrp_orphaned())
1192 return -EIO; 1192 return -EIO;
1193 kill_pg(process_group(current), SIGTTIN, 1); 1193 kill_pg(process_group(current), SIGTTIN, 1);
1194 return -ERESTARTSYS; 1194 return -ERESTARTSYS;
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 95f3596189cf..94070f7bf389 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1118,7 +1118,7 @@ int tty_check_change(struct tty_struct * tty)
1118 return 0; 1118 return 0;
1119 if (is_ignored(SIGTTOU)) 1119 if (is_ignored(SIGTTOU))
1120 return 0; 1120 return 0;
1121 if (is_orphaned_pgrp(process_group(current))) 1121 if (is_current_pgrp_orphaned())
1122 return -EIO; 1122 return -EIO;
1123 (void) kill_pg(process_group(current), SIGTTOU, 1); 1123 (void) kill_pg(process_group(current), SIGTTOU, 1);
1124 return -ERESTARTSYS; 1124 return -ERESTARTSYS;