From: Eric Paris <eparis@redhat.com>
To: linux-kernel@vger.kernel.org, linux-fs-devel@vger.kernel.org
Cc: zdenek.kabelac@gmail.com, torvalds@linux-foundation.org,
christoph.thielecke@gmx.de, akpm@linux-foundation.org,
viro@zeniv.linux.org.uk, grant.wilson@zen.co.uk,
mikko.cal@gmail.com
Subject: [PATCH 2/3] inotify: do not BUG on idr entries at inotify destruction
Date: Mon, 24 Aug 2009 13:38:12 -0400 [thread overview]
Message-ID: <20090824173812.14196.381.stgit@paris.rdu.redhat.com> (raw)
In-Reply-To: <20090824173524.14196.25992.stgit@paris.rdu.redhat.com>
If an inotify watch is left in the idr when an fsnotify group is destroyed
this will lead to a BUG. This is not a dangerous situation and really
indicates a programming bug and leak of memory. This patch changes it to
use a WARN and a printk rather than killing people's boxes.
Signed-off-by: Eric Paris <eparis@redhat.com>
---
fs/notify/inotify/inotify_fsnotify.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index 5dcbafe..cf003fc 100644
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -107,6 +107,16 @@ static bool inotify_should_send_event(struct fsnotify_group *group, struct inode
static int idr_callback(int id, void *p, void *data)
{
+ struct fsnotify_mark_entry *entry;
+ struct inotify_inode_mark_entry *ientry;
+
+ entry = p;
+ ientry = container_of(entry, struct inotify_inode_mark_entry, fsn_entry);
+
+ WARN(1, "inotify closing but id=%d still in idr. Probably leaking memory\n", id);
+
+ printk(KERN_WARNING "group=%p entry->group=%p inode=%p wd=%d\n",
+ data, entry->group, entry->inode, ientry->wd);
BUG();
return 0;
}
next prev parent reply other threads:[~2009-08-24 17:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-24 17:37 [PATCH 0/3] Inotify cleanup and idr race Eric Paris
2009-08-24 17:38 ` [PATCH 1/3] inotify: seperate new watch creation updating existing watches Eric Paris
2009-08-24 17:38 ` Eric Paris [this message]
2009-08-24 18:34 ` [PATCH 2/3] inotify: do not BUG on idr entries at inotify destruction Frans Pop
2009-08-24 19:09 ` Eric Paris
2009-08-24 19:23 ` Linus Torvalds
2009-08-24 19:32 ` Eric Paris
2009-08-24 20:36 ` Eric Paris
2009-08-25 11:42 ` Mikko C.
2009-08-25 14:18 ` Eric Paris
2009-08-25 16:43 ` Linus Torvalds
2009-08-25 17:17 ` Mikko C.
2009-08-24 17:38 ` [PATCH 3/3] inotify: fix locking around inotify watching in the idr Eric Paris
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=20090824173812.14196.381.stgit@paris.rdu.redhat.com \
--to=eparis@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=christoph.thielecke@gmx.de \
--cc=grant.wilson@zen.co.uk \
--cc=linux-fs-devel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mikko.cal@gmail.com \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
--cc=zdenek.kabelac@gmail.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
Powered by JetHome