From: Gabriel Ravier <gabravier@gmail.com>
To: musl@lists.openwall.com
Cc: Gabriel Ravier <gabravier@gmail.com>
Subject: [musl] [PATCH] fix wide printf numbered argument buffer overflow
Date: Fri, 14 Apr 2023 16:55:42 +0200 [thread overview]
Message-ID: <20230414145543.2877269-1-gabravier@gmail.com> (raw)
The nl_type and nl_arg arrays defined in vfwprintf may be accessed
with an index up to and including NL_ARGMAX, but they are only of size
NL_ARGMAX, meaning they may be written to or read from 1 element too
far.
For example, the following program:
#include <assert.h>
#include <stdio.h>
#include <string.h>
#include <wchar.h>
int main(void) {
char buffer[500];
for (size_t i = 0; i < sizeof(buffer); ++i)
buffer[i] = (i % 3) ? 0 : 42;
wchar_t result;
int ret = swprintf(&result, 1, L"%1$s", "");
assert(ret != -1);
}
evidences the bug, by sometimes mistakenly failing the assertion
and always triggering a warning under valgrind (the behavior is highly
dependent on build configuration - I could only reproduce the assert
failure with GCC 12.2.1 on a very specific system - but the bug is
still there, as evidenced by the warning valgrind always emits)
This patch fixes this.
---
src/stdio/vfwprintf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/stdio/vfwprintf.c b/src/stdio/vfwprintf.c
index 18784113..53697701 100644
--- a/src/stdio/vfwprintf.c
+++ b/src/stdio/vfwprintf.c
@@ -347,8 +347,8 @@ overflow:
int vfwprintf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
{
va_list ap2;
- int nl_type[NL_ARGMAX] = {0};
- union arg nl_arg[NL_ARGMAX];
+ int nl_type[NL_ARGMAX+1] = {0};
+ union arg nl_arg[NL_ARGMAX+1];
int olderr;
int ret;
--
2.39.2
next reply other threads:[~2023-04-14 14:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-14 14:55 Gabriel Ravier [this message]
2023-04-14 15:48 ` Rich Felker
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=20230414145543.2877269-1-gabravier@gmail.com \
--to=gabravier@gmail.com \
--cc=musl@lists.openwall.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.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
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).