From: Mimi Zohar <zohar@linux.vnet.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: safford@watson.ibm.com, serue@linux.vnet.ibm.com,
kjhall@linux.vnet.ibm.com, sailer@us.ibm.com, zohar@us.ibm.com,
akpm@osdl.org
Subject: [Patch -mm] integrity: ima exit
Date: Wed, 28 Mar 2007 12:39:13 -0400 [thread overview]
Message-ID: <1175099953.16382.1.camel@localhost.localdomain> (raw)
This patch corrects calling an __exit function from a non-_-exit function.
signed-off-by: Mimi Zohar <zohar@us.ibm.com>
signed-off-by: Kylene Hall <kjhall@us.ibm.com>
---
security/evm/ima/ima_init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.21-rc5-mm2/security/evm/ima/ima_init.c
===================================================================
--- linux-2.6.21-rc5-mm2.orig/security/evm/ima/ima_init.c
+++ linux-2.6.21-rc5-mm2/security/evm/ima/ima_init.c
@@ -111,7 +111,7 @@ int ima_init(void)
return ima_fs_init();
}
-void ima_cleanup(void)
+void __exit ima_cleanup(void)
{
ima_fs_cleanup();
}
Index: linux-2.6.21-rc5-mm2/security/evm/evm_integrity.h
===================================================================
--- linux-2.6.21-rc5-mm2.orig/security/evm/evm_integrity.h
+++ linux-2.6.21-rc5-mm2/security/evm/evm_integrity.h
@@ -9,21 +9,21 @@
extern unsigned int evm_enable_ima;
#ifdef CONFIG_IMA_MEASURE
-static inline int evm_ima_init(void)
+static int evm_ima_init(void)
{
if (evm_enable_ima)
return ima_init();
return 0;
}
-static inline void evm_ima_measure(const unsigned char *name, int hash_len,
+static void evm_ima_measure(const unsigned char *name, int hash_len,
char *hash)
{
if (evm_enable_ima)
ima_measure(name, hash_len, hash);
}
-static inline void evm_ima_cleanup(void)
+static void __exit evm_ima_cleanup(void)
{
if (evm_enable_ima)
ima_cleanup();
@@ -31,19 +31,19 @@ static inline void evm_ima_cleanup(void)
}
#else
-static inline int evm_ima_init(void)
+static int evm_ima_init(void)
{
evm_enable_ima = 0;
return 0;
}
-static inline void evm_ima_measure(const unsigned char *name, int hash_len,
+static void evm_ima_measure(const unsigned char *name, int hash_len,
char *hash)
{
return;
}
-static inline void evm_ima_cleanup(void)
+static void __exit evm_ima_cleanup(void)
{
evm_enable_ima = 0;
}
reply other threads:[~2007-03-28 16:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1175099953.16382.1.camel@localhost.localdomain \
--to=zohar@linux.vnet.ibm.com \
--cc=akpm@osdl.org \
--cc=kjhall@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=safford@watson.ibm.com \
--cc=sailer@us.ibm.com \
--cc=serue@linux.vnet.ibm.com \
--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
all inboxes | Powered by JetHome®