linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Paris <eparis@redhat.com>
To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-mm@kvack.org
Cc: viro@zeniv.linux.org.uk, jmorris@namei.org, npiggin@suse.de,
	eparis@redhat.com, zohar@us.ibm.com, jack@suse.cz,
	jmalicki@metacarta.com, dsmith@redhat.com, serue@us.ibm.com,
	hch@lst.de, john@johnmccutchan.com, rlove@rlove.org,
	ebiederm@xmission.com, heiko.carstens@de.ibm.com,
	penguin-kernel@I-love.SAKURA.ne.jp, mszeredi@suse.cz,
	jens.axboe@oracle.com, akpm@linux-foundation.org, matthew@wil.cx,
	hugh.dickins@tiscali.co.uk, kamezawa.hiroyu@jp.fujitsu.com,
	nishimura@mxp.nes.nec.co.jp, davem@davemloft.net, arnd@arndb.de,
	eric.dumazet@gmail.com
Subject: [RFC PATCH 15/15] ima: limit imbalance msg
Date: Fri, 04 Dec 2009 15:48:40 -0500	[thread overview]
Message-ID: <20091204204840.18286.81154.stgit@paris.rdu.redhat.com> (raw)
In-Reply-To: <20091204204646.18286.24853.stgit@paris.rdu.redhat.com>

From: Mimi Zohar <zohar@us.ibm.com>

Limit the number of imbalance messages to once per filesystem type instead of
once per system boot.  (it's actually slightly racy and could give you a
couple per fs, but this isn't a real issue)

Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
---

 security/integrity/ima/ima_main.c |   62 ++++++++++++++++++++++++++++++++-----
 1 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index c721ddc..14d109b 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -35,6 +35,55 @@ static int __init hash_setup(char *str)
 }
 __setup("ima_hash=", hash_setup);
 
+struct ima_imbalance {
+	struct hlist_node node;
+	unsigned long fsmagic;
+};
+
+/*
+ * ima_limit_imbalance - emit one imbalance message per filesystem type
+ *
+ * Maintain list of filesystem types that do not measure files properly.
+ * Return false if unknown, true if known.
+ */
+static bool ima_limit_imbalance(struct file *file)
+{
+	static DEFINE_SPINLOCK(ima_imbalance_lock);
+	static HLIST_HEAD(ima_imbalance_list);
+
+	struct super_block *sb = file->f_dentry->d_sb;
+	struct ima_imbalance *entry;
+	struct hlist_node *node;
+	bool found = false;
+
+	rcu_read_lock();
+	hlist_for_each_entry_rcu(entry, node, &ima_imbalance_list, node) {
+		if (entry->fsmagic == sb->s_magic) {
+			found = true;
+			break;
+		}
+	}
+	rcu_read_unlock();
+	if (found)
+		goto out;
+
+	entry = kmalloc(sizeof(*entry), GFP_NOFS);
+	if (!entry)
+		goto out;
+	entry->fsmagic = sb->s_magic;
+	spin_lock(&ima_imbalance_lock);
+	/*
+	 * we could have raced and something else might have added this fs
+	 * to the list, but we don't really care
+	 */
+	hlist_add_head_rcu(&entry->node, &ima_imbalance_list);
+	spin_unlock(&ima_imbalance_lock);
+	printk(KERN_INFO "IMA: unmeasured files on fsmagic: %lX\n",
+	       entry->fsmagic);
+out:
+	return found;
+}
+
 /*
  * Update the counts given a file
  */
@@ -72,15 +121,10 @@ static void ima_dec_counts(struct ima_iint_cache *iint, struct file *file)
 		}
 	}
 
-	if ((iint->opencount < 0) ||
-	    (iint->readcount < 0) ||
-	    (iint->writecount < 0)) {
-		static int dumped;
-
-		if (dumped)
-			return;
-		dumped = 1;
-
+	if (((iint->opencount < 0) ||
+	     (iint->readcount < 0) ||
+	     (iint->writecount < 0)) &&
+	    !ima_limit_imbalance(file)) {
 		printk(KERN_INFO "%s: open/free imbalance (r:%ld w:%ld o:%ld)\n",
 		       __FUNCTION__, iint->readcount, iint->writecount,
 		       iint->opencount);

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  parent reply	other threads:[~2009-12-04 20:48 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-04 20:46 [RFC PATCH 01/15] shmem: do not call fput_filp on an initialized filp Eric Paris
2009-12-04 20:46 ` [RFC PATCH 02/15] shmem: use alloc_file instead of init_file Eric Paris
2009-12-05 20:26   ` Hugh Dickins
2009-12-04 20:47 ` [RFC PATCH 03/15] pipes: use alloc-file instead of duplicating code Eric Paris
2009-12-04 20:47 ` [RFC PATCH 04/15] inotify: use alloc_file instead of doing it internally Eric Paris
2009-12-04 20:47 ` [RFC PATCH 05/15] networking: rework socket to fd mapping using alloc-file Eric Paris
2009-12-04 20:47 ` [RFC PATCH 06/15] vfs: make init-file static Eric Paris
2009-12-04 20:47 ` [RFC PATCH 07/15] fs: move get_empty_filp() deffinition to internal.h Eric Paris
2009-12-04 20:47 ` [RFC PATCH 08/15] ima: valid return code from ima_inode_alloc Eric Paris
2009-12-04 20:47 ` [RFC PATCH 09/15] ima: only insert at inode creation time Eric Paris
2009-12-04 20:48 ` [RFC PATCH 10/15] IMA: clean up the IMA counts updating code Eric Paris
2009-12-04 20:48 ` [RFC PATCH 11/15] ima: call ima_inode_free ima_inode_free Eric Paris
2009-12-04 20:48 ` [RFC PATCH 12/15] ima-path-check rework Eric Paris
2009-12-05 20:30   ` Hugh Dickins
2009-12-04 20:48 ` [RFC PATCH 13/15] ima: rename ima_path_check to ima_file_check Eric Paris
2009-12-04 20:48 ` [RFC PATCH 14/15] security: move ima_file_check() to lsm hook Eric Paris
2009-12-04 20:48 ` Eric Paris [this message]
2009-12-05 20:23 ` [RFC PATCH 01/15] shmem: do not call fput_filp on an initialized filp Hugh Dickins

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=20091204204840.18286.81154.stgit@paris.rdu.redhat.com \
    --to=eparis@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@arndb.de \
    --cc=davem@davemloft.net \
    --cc=dsmith@redhat.com \
    --cc=ebiederm@xmission.com \
    --cc=eric.dumazet@gmail.com \
    --cc=hch@lst.de \
    --cc=heiko.carstens@de.ibm.com \
    --cc=hugh.dickins@tiscali.co.uk \
    --cc=jack@suse.cz \
    --cc=jens.axboe@oracle.com \
    --cc=jmalicki@metacarta.com \
    --cc=jmorris@namei.org \
    --cc=john@johnmccutchan.com \
    --cc=kamezawa.hiroyu@jp.fujitsu.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=matthew@wil.cx \
    --cc=mszeredi@suse.cz \
    --cc=nishimura@mxp.nes.nec.co.jp \
    --cc=npiggin@suse.de \
    --cc=penguin-kernel@I-love.SAKURA.ne.jp \
    --cc=rlove@rlove.org \
    --cc=serue@us.ibm.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=zohar@us.ibm.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).