From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Nathan Chancellor <nathan@kernel.org>,
Nicolas Schier <nicolas@fjasle.eu>,
Masahiro Yamada <masahiroy@kernel.org>
Subject: [PATCH 3/3] modpost: move exit(1) for fatal() to modpost.h
Date: Sat, 25 Nov 2023 19:31:16 +0900 [thread overview]
Message-ID: <20231125103116.797608-3-masahiroy@kernel.org> (raw)
In-Reply-To: <20231125103116.797608-1-masahiroy@kernel.org>
fatal() never returns, but compilers are not aware of this fact because
exit(1) is called within the modpost_log() definition.
Move exit(1) to the fatal() macro so that compilers can identify
unreachable code flows.
Remove the initializer for 'taddr' in section_rel(), as compilers now
recognize this is not an uninitialized bug.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/mod/modpost.c | 4 +---
scripts/mod/modpost.h | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 013fc5031bc7..696c583a14ec 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -84,8 +84,6 @@ void modpost_log(enum loglevel loglevel, const char *fmt, ...)
vfprintf(stderr, fmt, arglist);
va_end(arglist);
- if (loglevel == LOG_FATAL)
- exit(1);
if (loglevel == LOG_ERROR)
error_occurred = true;
}
@@ -1415,7 +1413,7 @@ static void section_rel(struct module *mod, struct elf_info *elf,
for (rel = start; rel < stop; rel++) {
Elf_Sym *tsym;
- Elf_Addr taddr = 0, r_offset;
+ Elf_Addr taddr, r_offset;
unsigned int r_type, r_sym;
void *loc;
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index 9fe974dc1a52..aaa67b24775e 100644
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -215,4 +215,4 @@ modpost_log(enum loglevel loglevel, const char *fmt, ...);
*/
#define warn(fmt, args...) modpost_log(LOG_WARN, fmt, ##args)
#define error(fmt, args...) modpost_log(LOG_ERROR, fmt, ##args)
-#define fatal(fmt, args...) modpost_log(LOG_FATAL, fmt, ##args)
+#define fatal(fmt, args...) do { modpost_log(LOG_FATAL, fmt, ##args); exit(1); } while (1)
--
2.40.1
next prev parent reply other threads:[~2023-11-25 10:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-25 10:31 [PATCH 1/3] modpost: move __attribute__((format(printf, 2, 3))) to modpost.h Masahiro Yamada
2023-11-25 10:31 ` [PATCH 2/3] modpost: remove unreachable code after fatal() Masahiro Yamada
2023-11-30 0:29 ` Nathan Chancellor
2023-11-25 10:31 ` Masahiro Yamada [this message]
2023-11-30 0:32 ` [PATCH 3/3] modpost: move exit(1) for fatal() to modpost.h Nathan Chancellor
2023-12-03 9:03 ` Masahiro Yamada
2023-11-30 0:17 ` [PATCH 1/3] modpost: move __attribute__((format(printf, 2, 3))) " Nathan Chancellor
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=20231125103116.797608-3-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nathan@kernel.org \
--cc=nicolas@fjasle.eu \
/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