LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Jan Beulich" <jbeulich@novell.com>
To: <linux-kernel@vger.kernel.org>
Subject: [PATCH] fix verify_export_symbols()
Date: Thu, 13 Mar 2008 09:04:17 +0000 [thread overview]
Message-ID: <47D8FC21.76E4.0078.0@novell.com> (raw)
When the newer export flavors were added, it was apparently forgotten
to add respective code here.
In order to not double the (source) size of the function, add some
abstraction to reduce code duplication.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
---
kernel/module.c | 39 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 20 deletions(-)
--- linux-2.6.25-rc5/kernel/module.c 2008-03-10 13:24:35.000000000 +0100
+++ 2.6.25-rc5-verify-export-symbols/kernel/module.c 2008-03-04 11:23:05.000000000 +0100
@@ -1383,33 +1383,32 @@ EXPORT_SYMBOL_GPL(__symbol_get);
*/
static int verify_export_symbols(struct module *mod)
{
- const char *name = NULL;
- unsigned long i, ret = 0;
+ const char *name;
+ unsigned int i;
struct module *owner;
const unsigned long *crc;
- for (i = 0; i < mod->num_syms; i++)
- if (!IS_ERR_VALUE(__find_symbol(mod->syms[i].name,
- &owner, &crc, 1))) {
- name = mod->syms[i].name;
- ret = -ENOEXEC;
- goto dup;
- }
+#define VERIFY(syms) \
+ for (i = 0; i < mod->num_##syms; i++) { \
+ name = mod->syms[i].name; \
+ if (!IS_ERR_VALUE(__find_symbol(name, &owner, &crc, 1))) \
+ goto dup; \
+ }
- for (i = 0; i < mod->num_gpl_syms; i++)
- if (!IS_ERR_VALUE(__find_symbol(mod->gpl_syms[i].name,
- &owner, &crc, 1))) {
- name = mod->gpl_syms[i].name;
- ret = -ENOEXEC;
- goto dup;
- }
+ VERIFY(syms);
+ VERIFY(gpl_syms);
+ VERIFY(gpl_future_syms);
+ VERIFY(unused_syms);
+ VERIFY(unused_gpl_syms);
+#undef VERIFY
+
+ return 0;
dup:
- if (ret)
- printk(KERN_ERR "%s: exports duplicate symbol %s (owned by %s)\n",
- mod->name, name, module_name(owner));
+ printk(KERN_ERR "%s: exports duplicate symbol %s (owned by %s)\n",
+ mod->name, name, module_name(owner));
- return ret;
+ return -ENOEXEC;
}
/* Change all symbols so that st_value encodes the pointer directly. */
next reply other threads:[~2008-03-13 9:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-13 9:04 Jan Beulich [this message]
2008-03-17 22:36 ` Rusty Russell
2008-03-18 0:29 ` Rusty Russell
2008-03-20 5:25 ` [PATCH 1/2] module: neaten __find_symbol, rename to find_symbol Rusty Russell
2008-03-20 5:27 ` [PATCH 2/2] module: Enhance verify_export_symbols Rusty Russell
-- strict thread matches above, loose matches on Subject: below --
2008-01-10 16:37 [PATCH] fix verify_export_symbols() Jan Beulich
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=47D8FC21.76E4.0078.0@novell.com \
--to=jbeulich@novell.com \
--cc=linux-kernel@vger.kernel.org \
--subject='Re: [PATCH] fix verify_export_symbols()' \
/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
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).