All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dmitry Kasatkin <d.kasatkin@samsung.com>
To: zohar@linux.vnet.ibm.com, linux-ima-devel@lists.sourceforge.net,
	linux-security-module@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, dmitry.kasatkin@gmail.com,
	Dmitry Kasatkin <d.kasatkin@samsung.com>
Subject: [PATCH 8/8] ima: initialize only required template
Date: Wed, 03 Sep 2014 10:20:01 +0300	[thread overview]
Message-ID: <ee009655866311106c98cdf87371d52f242782af.1409728712.git.d.kasatkin@samsung.com> (raw)
In-Reply-To: <cover.1409728712.git.d.kasatkin@samsung.com>
In-Reply-To: <cover.1409728712.git.d.kasatkin@samsung.com>

IMA uses only one template. This patch initializes only required
template to avoid unnecessary memory allocations.

Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
---
 security/integrity/ima/ima_template.c | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c
index f682606..e854862 100644
--- a/security/integrity/ima/ima_template.c
+++ b/security/integrity/ima/ima_template.c
@@ -152,24 +152,6 @@ out:
 	return result;
 }
 
-static int __init init_defined_templates(void)
-{
-	int i = 0;
-	int result = 0;
-
-	/* Init defined templates. */
-	for (i = 0; i < ARRAY_SIZE(defined_templates); i++) {
-		struct ima_template_desc *template = &defined_templates[i];
-
-		result = template_desc_init_fields(template->fmt,
-						   &(template->fields),
-						   &(template->num_fields));
-		if (result < 0)
-			return result;
-	}
-	return result;
-}
-
 struct ima_template_desc *ima_template_desc_current(void)
 {
 	if (!ima_template)
@@ -180,11 +162,9 @@ struct ima_template_desc *ima_template_desc_current(void)
 
 int __init ima_init_template(void)
 {
-	int result;
-
-	result = init_defined_templates();
-	if (result < 0)
-		return result;
+	struct ima_template_desc *template = ima_template_desc_current();
 
-	return 0;
+	return template_desc_init_fields(template->fmt,
+					 &(template->fields),
+					 &(template->num_fields));
 }
-- 
1.9.1


  parent reply	other threads:[~2014-09-03  7:23 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-03  7:19 [PATCH 0/8] integrity: miscellaneous cleanups Dmitry Kasatkin
2014-09-03  7:19 ` [PATCH 1/8] integrity: prevent flooding with 'Request for unknown key' Dmitry Kasatkin
2014-09-03  7:19 ` [PATCH 2/8] integrity: remove declaration of non-existing functions Dmitry Kasatkin
2014-09-03 12:51   ` Mimi Zohar
2014-09-03 13:14     ` Dmitry Kasatkin
2014-09-03  7:19 ` [PATCH 3/8] ima: simplify conditional statement to improve performance Dmitry Kasatkin
2014-09-03 13:00   ` Mimi Zohar
2014-09-03  7:19 ` [PATCH 4/8] ima: remove unnecessary extra variable Dmitry Kasatkin
2014-09-03  7:19 ` [PATCH 5/8] ima: add missing '__init' keywords Dmitry Kasatkin
2014-09-03 13:53   ` [Linux-ima-devel] " Roberto Sassu
2014-09-03  7:19 ` [PATCH 6/8] ima: remove unnecessary code Dmitry Kasatkin
2014-09-03 13:08   ` Mimi Zohar
2014-09-03 13:34     ` Dmitry Kasatkin
2014-09-03  7:20 ` [PATCH 7/8] ima: remove usage of filename parameter Dmitry Kasatkin
2014-09-03 13:16   ` Mimi Zohar
2014-09-03 13:28     ` Dmitry Kasatkin
2014-09-03 14:17       ` Mimi Zohar
2014-09-03  7:20 ` Dmitry Kasatkin [this message]
2014-09-03 13:45   ` [Linux-ima-devel] [PATCH 8/8] ima: initialize only required template Roberto Sassu
2014-09-03 13:52     ` Dmitry Kasatkin

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=ee009655866311106c98cdf87371d52f242782af.1409728712.git.d.kasatkin@samsung.com \
    --to=d.kasatkin@samsung.com \
    --cc=dmitry.kasatkin@gmail.com \
    --cc=linux-ima-devel@lists.sourceforge.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=zohar@linux.vnet.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.