From: Aaron Tomlin <atomlin@redhat.com>
To: mcgrof@kernel.org, christophe.leroy@csgroup.eu
Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org,
jeyu@kernel.org, linux-kernel@vger.kernel.org,
linux-modules@vger.kernel.org, void@manifault.com,
atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com,
msuchanek@suse.de, oleksandr@natalenko.name,
jason.wessel@windriver.com, pmladek@suse.com,
daniel.thompson@linaro.org, hch@infradead.org
Subject: [PATCH v11 03/14] module: Make internal.h and decompress.c more compliant
Date: Thu, 10 Mar 2022 10:24:02 +0000 [thread overview]
Message-ID: <20220310102413.3438665-4-atomlin@redhat.com> (raw)
In-Reply-To: <20220310102413.3438665-1-atomlin@redhat.com>
This patch will address the following warning and style violations
generated by ./scripts/checkpatch.pl in strict mode:
WARNING: Use #include <linux/module.h> instead of <asm/module.h>
#10: FILE: kernel/module/internal.h:10:
+#include <asm/module.h>
CHECK: spaces preferred around that '-' (ctx:VxV)
#18: FILE: kernel/module/internal.h:18:
+#define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))
CHECK: Please use a blank line after function/struct/union/enum declarations
#69: FILE: kernel/module/internal.h:69:
+}
+static inline void module_decompress_cleanup(struct load_info *info)
^
CHECK: extern prototypes should be avoided in .h files
#84: FILE: kernel/module/internal.h:84:
+extern int mod_verify_sig(const void *mod, struct load_info *info);
WARNING: Missing a blank line after declarations
#116: FILE: kernel/module/decompress.c:116:
+ struct page *page = module_get_next_page(info);
+ if (!page) {
WARNING: Missing a blank line after declarations
#174: FILE: kernel/module/decompress.c:174:
+ struct page *page = module_get_next_page(info);
+ if (!page) {
CHECK: Please use a blank line after function/struct/union/enum declarations
#258: FILE: kernel/module/decompress.c:258:
+}
+static struct kobj_attribute module_compression_attr = __ATTR_RO(compression);
Note: Fortunately, the multiple-include optimisation found in
include/linux/module.h will prevent duplication/or inclusion more than
once.
Fixes: f314dfea16a ("modsign: log module name in the event of an error")
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Aaron Tomlin <atomlin@redhat.com>
---
kernel/module/decompress.c | 3 +++
kernel/module/internal.h | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/kernel/module/decompress.c b/kernel/module/decompress.c
index d14d6443225a..2fc7081dd7c1 100644
--- a/kernel/module/decompress.c
+++ b/kernel/module/decompress.c
@@ -113,6 +113,7 @@ static ssize_t module_gzip_decompress(struct load_info *info,
do {
struct page *page = module_get_next_page(info);
+
if (!page) {
retval = -ENOMEM;
goto out_inflate_end;
@@ -171,6 +172,7 @@ static ssize_t module_xz_decompress(struct load_info *info,
do {
struct page *page = module_get_next_page(info);
+
if (!page) {
retval = -ENOMEM;
goto out;
@@ -256,6 +258,7 @@ static ssize_t compression_show(struct kobject *kobj,
{
return sysfs_emit(buf, "%s\n", __stringify(MODULE_COMPRESSION));
}
+
static struct kobj_attribute module_compression_attr = __ATTR_RO(compression);
static int __init module_decompress_sysfs_init(void)
diff --git a/kernel/module/internal.h b/kernel/module/internal.h
index ea8c4c02614c..e0775e66bcf7 100644
--- a/kernel/module/internal.h
+++ b/kernel/module/internal.h
@@ -6,7 +6,8 @@
*/
#include <linux/elf.h>
-#include <asm/module.h>
+#include <linux/compiler.h>
+#include <linux/module.h>
#include <linux/mutex.h>
#ifndef ARCH_SHF_SMALL
@@ -54,7 +55,7 @@ struct load_info {
} index;
};
-extern int mod_verify_sig(const void *mod, struct load_info *info);
+int mod_verify_sig(const void *mod, struct load_info *info);
#ifdef CONFIG_MODULE_DECOMPRESS
int module_decompress(struct load_info *info, const void *buf, size_t size);
@@ -65,6 +66,7 @@ static inline int module_decompress(struct load_info *info,
{
return -EOPNOTSUPP;
}
+
static inline void module_decompress_cleanup(struct load_info *info)
{
}
--
2.34.1
next prev parent reply other threads:[~2022-03-10 10:24 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-10 10:23 [PATCH v11 00/14] module: core code clean up Aaron Tomlin
2022-03-10 10:24 ` [PATCH v11 01/14] module: Move all into module/ Aaron Tomlin
2022-03-10 10:24 ` [PATCH v11 02/14] module: Simple refactor in preparation for split Aaron Tomlin
2022-03-10 10:24 ` Aaron Tomlin [this message]
2022-03-10 10:24 ` [PATCH v11 04/14] module: Move livepatch support to a separate file Aaron Tomlin
2022-03-10 10:24 ` [PATCH v11 05/14] module: Move latched RB-tree " Aaron Tomlin
2022-03-10 10:24 ` [PATCH v11 06/14] module: Move strict rwx " Aaron Tomlin
2022-03-10 10:24 ` [PATCH v11 07/14] module: Move extra signature support out of core code Aaron Tomlin
2022-03-10 10:24 ` [PATCH v11 08/14] module: Move kmemleak support to a separate file Aaron Tomlin
2022-03-10 10:24 ` [PATCH v11 09/14] module: Move kallsyms support into " Aaron Tomlin
2022-06-28 4:05 ` Steven Rostedt
2022-06-28 8:19 ` Aaron Tomlin
2022-07-01 22:34 ` Luis Chamberlain
2022-07-03 8:33 ` Aaron Tomlin
2022-07-03 13:23 ` Steven Rostedt
2022-07-03 13:57 ` Aaron Tomlin
2022-07-03 14:13 ` Steven Rostedt
2022-07-03 14:24 ` Aaron Tomlin
2022-07-03 17:58 ` Christophe Leroy
2022-07-03 23:18 ` Steven Rostedt
2022-03-10 10:24 ` [PATCH v11 10/14] module: kallsyms: Fix suspicious rcu usage Aaron Tomlin
2022-06-28 3:56 ` Steven Rostedt
2022-06-28 16:21 ` Aaron Tomlin
2022-06-28 16:24 ` Steven Rostedt
2022-03-10 10:24 ` [PATCH v11 11/14] module: Move procfs support into a separate file Aaron Tomlin
2022-03-10 10:26 ` [PATCH v11 12/14] module: Move sysfs " Aaron Tomlin
2022-03-10 10:26 ` [PATCH v11 13/14] module: Move kdb module related code out of main kdb code Aaron Tomlin
2022-03-10 10:30 ` Aaron Tomlin
2022-03-11 16:17 ` Daniel Thompson
2022-03-11 18:00 ` Luis Chamberlain
2022-03-10 10:26 ` [PATCH v11 14/14] module: Move version support into a separate file Aaron Tomlin
2022-03-10 10:32 ` Aaron Tomlin
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=20220310102413.3438665-4-atomlin@redhat.com \
--to=atomlin@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=allen.lkml@gmail.com \
--cc=atomlin@atomlin.com \
--cc=christophe.leroy@csgroup.eu \
--cc=cl@linux.com \
--cc=daniel.thompson@linaro.org \
--cc=hch@infradead.org \
--cc=jason.wessel@windriver.com \
--cc=jeyu@kernel.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=mbenes@suse.cz \
--cc=mcgrof@kernel.org \
--cc=msuchanek@suse.de \
--cc=oleksandr@natalenko.name \
--cc=pmladek@suse.com \
--cc=void@manifault.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).