From: Ingo Molnar <mingo@elte.hu>
To: Roland McGrath <roland@redhat.com>
Cc: Linus Torvalds <torvalds@transmeta.com>,
Anton Blanchard <anton@samba.org>, Andrew Morton <akpm@digeo.com>,
Arjan van de Ven <arjanv@redhat.com>,
<linux-kernel@vger.kernel.org>
Subject: Re: heavy handed exit() in latest BK
Date: Sun, 9 Feb 2003 13:18:16 +0100 (CET) [thread overview]
Message-ID: <Pine.LNX.4.44.0302091305180.5085-100000@localhost.localdomain> (raw)
In-Reply-To: <200302091156.h19BuoH07869@magilla.sf.frob.com>
On Sun, 9 Feb 2003, Roland McGrath wrote:
> > - session-IDs and group-IDs are set outside the tasklist lock. This
> > causes breakage in the USB code. The correct fix is to do this:
>
> This is outside the part of the code that I've touched lately.
yes, i introduced the bug with the new pidhash. Here's the fix, against
BK-curr.
Ingo
--- linux/include/linux/sched.h.orig
+++ linux/include/linux/sched.h
@@ -503,6 +503,8 @@
extern struct mm_struct init_mm;
extern struct task_struct *find_task_by_pid(int pid);
+extern void set_special_pids(pid_t session, pid_t pgrp);
+extern void __set_special_pids(pid_t session, pid_t pgrp);
/* per-UID process charging. */
extern struct user_struct * alloc_uid(uid_t);
--- linux/fs/jffs/intrep.c.orig
+++ linux/fs/jffs/intrep.c
@@ -3344,8 +3344,7 @@
lock_kernel();
exit_mm(c->gc_task);
- current->session = 1;
- current->pgrp = 1;
+ set_special_pids(1, 1);
init_completion(&c->gc_thread_comp); /* barrier */
spin_lock_irq(¤t->sighand->siglock);
siginitsetinv (¤t->blocked, sigmask(SIGHUP) | sigmask(SIGKILL) | sigmask(SIGSTOP) | sigmask(SIGCONT));
--- linux/kernel/exit.c.orig
+++ linux/kernel/exit.c
@@ -254,6 +254,29 @@
write_unlock_irq(&tasklist_lock);
}
+void __set_special_pids(pid_t session, pid_t pgrp)
+{
+ struct task_struct *curr = current;
+
+ if (curr->session != session) {
+ detach_pid(curr, PIDTYPE_SID);
+ curr->session = session;
+ attach_pid(curr, PIDTYPE_SID, session);
+ }
+ if (curr->pgrp != pgrp) {
+ detach_pid(curr, PIDTYPE_PGID);
+ curr->pgrp = pgrp;
+ attach_pid(curr, PIDTYPE_PGID, pgrp);
+ }
+}
+
+void set_special_pids(pid_t session, pid_t pgrp)
+{
+ write_lock_irq(&tasklist_lock);
+ __set_special_pids(session, pgrp);
+ write_unlock_irq(&tasklist_lock);
+}
+
/*
* Put all the gunge required to become a kernel thread without
* attached user resources in one place where it belongs.
@@ -271,8 +294,7 @@
*/
exit_mm(current);
- current->session = 1;
- current->pgrp = 1;
+ set_special_pids(1, 1);
current->tty = NULL;
/* Become as one with the init task */
--- linux/kernel/kmod.c.orig
+++ linux/kernel/kmod.c
@@ -100,8 +100,7 @@
int i;
struct task_struct *curtask = current;
- curtask->session = 1;
- curtask->pgrp = 1;
+ set_special_pids(1, 1);
use_init_fs_context();
--- linux/kernel/sys.c.orig
+++ linux/kernel/sys.c
@@ -1021,16 +1021,7 @@
goto out;
current->leader = 1;
- if (current->session != current->pid) {
- detach_pid(current, PIDTYPE_SID);
- current->session = current->pid;
- attach_pid(current, PIDTYPE_SID, current->pid);
- }
- if (current->pgrp != current->pid) {
- detach_pid(current, PIDTYPE_PGID);
- current->pgrp = current->pid;
- attach_pid(current, PIDTYPE_PGID, current->pid);
- }
+ __set_special_pids(current->pid, current->pid);
current->tty = NULL;
current->tty_old_pgrp = 0;
err = current->pgrp;
next prev parent reply other threads:[~2003-02-09 12:06 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200302091130.h19BU2107744@magilla.sf.frob.com>
2003-02-09 11:40 ` heavy handed exit() in latest BK Ingo Molnar
2003-02-09 11:56 ` Roland McGrath
2003-02-09 12:09 ` Ingo Molnar
2003-02-09 12:18 ` Ingo Molnar [this message]
2003-02-09 12:23 ` Ingo Molnar
2003-02-09 12:22 ` Arjan van de Ven
2003-02-10 1:07 ` Linus Torvalds
2003-02-10 1:27 ` Roland McGrath
2003-02-09 0:57 Anton Blanchard
2003-02-09 2:00 ` Linus Torvalds
2003-02-09 2:17 ` Roland McGrath
2003-02-09 2:19 ` Linus Torvalds
2003-02-09 2:31 ` Roland McGrath
2003-02-09 2:34 ` Linus Torvalds
2003-02-09 2:33 ` Linus Torvalds
2003-02-09 2:41 ` Roland McGrath
2003-02-09 3:30 ` Roland McGrath
2003-02-09 3:33 ` Roland McGrath
2003-02-09 3:37 ` Linus Torvalds
2003-02-09 3:40 ` Linus Torvalds
2003-02-09 3:48 ` Roland McGrath
2003-02-09 4:51 ` Linus Torvalds
2003-02-09 4:57 ` Linus Torvalds
2003-02-09 5:00 ` Roland McGrath
2003-02-09 9:28 ` Russell King
2003-02-10 8:53 ` Ingo Molnar
2003-02-10 15:22 ` Linus Torvalds
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=Pine.LNX.4.44.0302091305180.5085-100000@localhost.localdomain \
--to=mingo@elte.hu \
--cc=akpm@digeo.com \
--cc=anton@samba.org \
--cc=arjanv@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=roland@redhat.com \
--cc=torvalds@transmeta.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;
as well as URLs for NNTP newsgroup(s).