From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
To: linux-nfc@lists.01.org
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Subject: [linux-nfc] [neard][PATCH 02/16] nfctool: annotate printf-like functions as accepting format
Date: Wed, 14 Jul 2021 13:05:04 +0200 [thread overview]
Message-ID: <20210714110518.104655-3-krzysztof.kozlowski@canonical.com> (raw)
In-Reply-To: <20210714110518.104655-1-krzysztof.kozlowski@canonical.com>
Printf-like functions should have the "format" argument annotated to:
1. Help in detection of format string vulnerabilities (and mistakes).
2. Satisfy -Wformat-nonliteral (-Wformat=2) warning.
This fixes clang warnings like:
tools/nfctool/sniffer.c:206:18: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
sprintf(line, fmt, offset);
^~~
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
tools/nfctool/sniffer.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/nfctool/sniffer.c b/tools/nfctool/sniffer.c
index 3d1d230a50c5..6a38a213c74d 100644
--- a/tools/nfctool/sniffer.c
+++ b/tools/nfctool/sniffer.c
@@ -168,7 +168,6 @@ void sniffer_print_hexdump(FILE *file, guint8 *data, guint32 len,
gchar *hexa = NULL, *human = NULL;
guint8 offset_len;
guint8 human_offset;
- gchar *fmt;
if (len == 0)
return;
@@ -185,11 +184,9 @@ void sniffer_print_hexdump(FILE *file, guint8 *data, guint32 len,
if (output_len > 0xFFFF) {
offset_len = 8;
human_offset = HUMAN_READABLE_OFFSET + 4;
- fmt = "%08X: ";
} else {
offset_len = 4;
human_offset = HUMAN_READABLE_OFFSET;
- fmt = "%04X: ";
}
if (print_len) {
@@ -203,7 +200,10 @@ void sniffer_print_hexdump(FILE *file, guint8 *data, guint32 len,
if (digits == 0) {
memset(line, ' ', human_offset);
- sprintf(line, fmt, offset);
+ if (offset_len == 8)
+ sprintf(line, "%08X: ", offset);
+ else
+ sprintf(line, "%04X: ", offset);
offset += 16;
--
2.27.0
_______________________________________________
Linux-nfc mailing list -- linux-nfc@lists.01.org
To unsubscribe send an email to linux-nfc-leave@lists.01.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
next prev parent reply other threads:[~2021-07-14 11:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 11:05 [linux-nfc] [neard][PATCH 00/16] -Wformat=2 and few memory leaks Krzysztof Kozlowski
2021-07-14 11:05 ` [linux-nfc] [neard][PATCH 01/16] gdbus: annotate printf-like functions as accepting format Krzysztof Kozlowski
2021-07-14 11:05 ` Krzysztof Kozlowski [this message]
2021-07-14 11:05 ` [linux-nfc] [neard][PATCH 03/16] mifare: use unsigned int to suppress compiler -Wstrict-overflow Krzysztof Kozlowski
2021-07-14 11:05 ` [linux-nfc] [neard][PATCH 04/16] build: enable -Wformat=2 warnings Krzysztof Kozlowski
2021-07-14 11:05 ` [linux-nfc] [neard][PATCH 05/16] build: enable -Wunsafe-loop-optimizations and -Wstrict-overflow=2 warnings Krzysztof Kozlowski
2021-07-14 11:05 ` [linux-nfc] [neard][PATCH 06/16] TODO: remove finished tasks Krzysztof Kozlowski
2021-07-14 11:05 ` [linux-nfc] [neard][PATCH 07/16] ci: build also on Ubuntu Hirsute in non-maintainer mode Krzysztof Kozlowski
2021-07-14 11:05 ` [linux-nfc] [neard][PATCH 08/16] ci: simplify getting test logs Krzysztof Kozlowski
2021-07-14 11:05 ` [linux-nfc] [neard][PATCH 09/16] build: fix missing usage of PIE check result Krzysztof Kozlowski
2021-07-14 11:05 ` [linux-nfc] [neard][PATCH 10/16] build: add support for GCC sanitizers (asan, lsan and ubsan) Krzysztof Kozlowski
2021-07-14 11:05 ` [linux-nfc] [neard][PATCH 11/16] ndef: make freeing near_ndef_message reusable Krzysztof Kozlowski
2021-07-14 11:05 ` [linux-nfc] [neard][PATCH 12/16] snep-send: fix near_ndef_message memory leak Krzysztof Kozlowski
2021-07-14 11:05 ` [linux-nfc] [neard][PATCH 13/16] unit: fix memory leaks in test-ndef-parse Krzysztof Kozlowski
2021-07-14 11:05 ` [linux-nfc] [neard][PATCH 14/16] tag: do not open-code freeing ndef message Krzysztof Kozlowski
2021-07-14 11:05 ` [linux-nfc] [neard][PATCH 15/16] unit: " Krzysztof Kozlowski
2021-07-14 11:05 ` [linux-nfc] [neard][PATCH 16/16] ci: add build with sanitizers (asan, lsan and ubsan) Krzysztof Kozlowski
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=20210714110518.104655-3-krzysztof.kozlowski@canonical.com \
--to=krzysztof.kozlowski@canonical.com \
--cc=linux-nfc@lists.01.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).