From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>,
Scott James Remnant <scott@ubuntu.com>,
Evgeniy Polyakov <zbr@ioremap.net>,
Linux Kernel <linux-kernel@vger.kernel.org>,
Matt Helsley <matthltc@us.ibm.com>,
"David S. Miller" <davem@davemloft.net>,
netdev@vger.kernel.org
Subject: [PATCH] connector: Fix regression introduced by sid connector
Date: Wed, 30 Sep 2009 08:43:11 +0200 [thread overview]
Message-ID: <200909300843.11208.borntraeger@de.ibm.com> (raw)
In-Reply-To: <20090929162855.GA15319@redhat.com>
Hi Andrew,
since commit 02b51df1b07b4e9ca823c89284e704cadb323cd1 (proc connector: add event
for process becoming session leader) we have the following warning:
Badness at kernel/softirq.c:143
[...]
Krnl PSW : 0404c00180000000 00000000001481d4 (local_bh_enable+0xb0/0xe0)
[...]
Call Trace:
([<000000013fe04100>] 0x13fe04100)
[<000000000048a946>] sk_filter+0x9a/0xd0
[<000000000049d938>] netlink_broadcast+0x2c0/0x53c
[<00000000003ba9ae>] cn_netlink_send+0x272/0x2b0
[<00000000003baef0>] proc_sid_connector+0xc4/0xd4
[<0000000000142604>] __set_special_pids+0x58/0x90
[<0000000000159938>] sys_setsid+0xb4/0xd8
[<00000000001187fe>] sysc_noemu+0x10/0x16
[<00000041616cb266>] 0x41616cb266
The warning is
---> WARN_ON_ONCE(in_irq() || irqs_disabled());
The network code must not be called with disabled interrupts but
sys_setsid holds the tasklist_lock with spinlock_irq while calling
the connector.
After a discussion we agreed that we can move proc_sid_connector
from __set_special_pids to sys_setsid.
We also agreed that it is sufficient to change the check from
task_session(curr) != pid into err > 0, since if we don't change the
session, this means we were already the leader and return -EPERM.
One last thing:
There is also daemonize(), and some people might want to get a
notification in that case. Since daemonize() is only needed if a user
space does kernel_thread this does not look important (and there seems
to be no consensus if this connector should be called in daemonize). If
we really want this, we can add proc_sid_connector to daemonize() in an
additional patch (Scott?)
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
CCed: Scott James Remnant <scott@ubuntu.com>
CCed: Matt Helsley <matthltc@us.ibm.com>
CCed: David S. Miller <davem@davemloft.net>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
---
kernel/exit.c | 4 +---
kernel/sys.c | 2 ++
2 files changed, 3 insertions(+), 3 deletions(-)
Index: linux-2.6/kernel/exit.c
===================================================================
--- linux-2.6.orig/kernel/exit.c
+++ linux-2.6/kernel/exit.c
@@ -359,10 +359,8 @@ void __set_special_pids(struct pid *pid)
{
struct task_struct *curr = current->group_leader;
- if (task_session(curr) != pid) {
+ if (task_session(curr) != pid)
change_pid(curr, PIDTYPE_SID, pid);
- proc_sid_connector(curr);
- }
if (task_pgrp(curr) != pid)
change_pid(curr, PIDTYPE_PGID, pid);
Index: linux-2.6/kernel/sys.c
===================================================================
--- linux-2.6.orig/kernel/sys.c
+++ linux-2.6/kernel/sys.c
@@ -1110,6 +1110,8 @@ SYSCALL_DEFINE0(setsid)
err = session;
out:
write_unlock_irq(&tasklist_lock);
+ if (err > 0)
+ proc_sid_connector(sid);
return err;
}
next prev parent reply other threads:[~2009-09-30 6:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200909251123.03482.borntraeger@de.ibm.com>
[not found] ` <200909291226.28548.borntraeger@de.ibm.com>
[not found] ` <fbbbe0a028fa.4ac1f1c0@2ka.mipt.ru>
2009-09-29 13:24 ` 2.3.31++: Badness at kernel/softirq.c:143 due to new session leader connector Oleg Nesterov
2009-09-29 13:47 ` [PATCH] connector: Fix sid connector (was: Badness at kernel/softirq.c:143...) Christian Borntraeger
2009-09-29 13:59 ` Oleg Nesterov
2009-09-29 14:07 ` Evgeniy Polyakov
2009-09-29 14:15 ` Christian Borntraeger
2009-09-29 14:25 ` Oleg Nesterov
2009-09-29 14:45 ` Oleg Nesterov
2009-09-29 15:12 ` Christian Borntraeger
2009-09-29 16:28 ` Oleg Nesterov
2009-09-30 6:43 ` Christian Borntraeger [this message]
2009-10-01 21:14 ` [PATCH] connector: Fix regression introduced by sid connector Andrew Morton
2009-10-01 22:29 ` Oleg Nesterov
2009-10-02 6:16 ` Christian Borntraeger
2009-10-14 0:53 ` David Rientjes
2009-09-29 17:07 ` [PATCH] connector: Fix sid connector (was: Badness at kernel/softirq.c:143...) Evgeniy Polyakov
2009-09-29 14:54 ` Evgeniy Polyakov
2009-09-29 15:36 ` Oleg Nesterov
2009-09-29 17:08 ` Evgeniy Polyakov
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=200909300843.11208.borntraeger@de.ibm.com \
--to=borntraeger@de.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=matthltc@us.ibm.com \
--cc=netdev@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=scott@ubuntu.com \
--cc=zbr@ioremap.net \
/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).