From: "Darrick J. Wong" <djwong@kernel.org>
To: Carlos Maiolino <cem@kernel.org>, Christoph Hellwig <hch@infradead.org>
Cc: xfs <linux-xfs@vger.kernel.org>
Subject: [PATCH v2] xfs_repair: detect null buf passed to duration
Date: Sat, 1 Jun 2024 10:58:53 -0700 [thread overview]
Message-ID: <20240601175853.GY52987@frogsfrogsfrogs> (raw)
In-Reply-To: <20240531201039.GR52987@frogsfrogsfrogs>
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 declaration that buf isn't null.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
repair/progress.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/repair/progress.h b/repair/progress.h
index 0b06b2c4f43f..c09aa69413ac 100644
--- a/repair/progress.h
+++ b/repair/progress.h
@@ -38,7 +38,7 @@ extern void summary_report(void);
extern int set_progress_msg(int report, uint64_t total);
extern uint64_t print_final_rpt(void);
extern char *timestamp(struct xfs_mount *mp, int end, int phase, char *buf);
-extern char *duration(time_t val, char *buf);
+char *duration(time_t val, char *buf) __attribute__((nonnull(2)));
extern int do_parallel;
#define PROG_RPT_INC(a,b) if (ag_stride && prog_rpt_done) (a) += (b)
next prev parent reply other threads:[~2024-06-01 17:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-31 20:10 [PATCH] xfs_repair: detect null buf passed to duration Darrick J. Wong
2024-06-01 5:00 ` Christoph Hellwig
2024-06-01 17:58 ` Darrick J. Wong
2024-06-01 17:58 ` Darrick J. Wong [this message]
2024-06-03 12:42 ` [PATCH v2] " 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=20240601175853.GY52987@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=cem@kernel.org \
--cc=hch@infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.