From: "Darrick J. Wong" <djwong@kernel.org>
To: Carlos Maiolino <cem@kernel.org>
Cc: xfs <linux-xfs@vger.kernel.org>
Subject: [PATCH] xfs_repair: detect null buf passed to duration
Date: Fri, 31 May 2024 13:10:39 -0700 [thread overview]
Message-ID: <20240531201039.GR52987@frogsfrogsfrogs> (raw)
From: Darrick J. Wong <djwong@kernel.org>
gcc 12.2 with ubsan and fortify turned on complains about this:
In file included from /usr/include/stdio.h:906,
from ../include/platform_defs.h:9,
from ../include/libxfs.h:16,
from progress.c:3:
In function ‘sprintf’,
inlined from ‘duration’ at progress.c:443:4:
/usr/include/x86_64-linux-gnu/bits/stdio2.h:30:10: error: null destination pointer [-Werror=format-overflow=]
30 | return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
31 | __glibc_objsize (__s), __fmt,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
32 | __va_arg_pack ());
| ~~~~~~~~~~~~~~~~~
I think this is a false negative since all callers are careful not to
pass in a null pointer. Unfortunately the compiler cannot detect that
since this isn't a static function and complains. Fix this by adding an
explicit null check.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
repair/progress.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/repair/progress.c b/repair/progress.c
index 084afa63c121..e13494e0ed23 100644
--- a/repair/progress.c
+++ b/repair/progress.c
@@ -435,6 +435,9 @@ duration(time_t length, char *buf)
int seconds;
char temp[128];
+ if (!buf)
+ return NULL;
+
*buf = '\0';
weeks = days = hours = minutes = seconds = sum = 0;
if (length >= ONEWEEK) {
next reply other threads:[~2024-05-31 20:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-31 20:10 Darrick J. Wong [this message]
2024-06-01 5:00 ` [PATCH] xfs_repair: detect null buf passed to duration Christoph Hellwig
2024-06-01 17:58 ` Darrick J. Wong
2024-06-01 17:58 ` [PATCH v2] " Darrick J. Wong
2024-06-03 12:42 ` Carlos Maiolino
2024-06-03 16:14 ` Darrick J. Wong
2024-06-05 14:17 ` Carlos Maiolino
2024-06-04 4:09 ` Christoph Hellwig
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=20240531201039.GR52987@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=cem@kernel.org \
--cc=linux-xfs@vger.kernel.org \
/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