From: Andrew Morton <akpm@osdl•org>
To: mbligh@mbligh•org, jeremy@goop•org, mbligh@google•com,
linux-kernel@vger•kernel.org, apw@shadowen•org,
linuxppc64-dev@ozlabs•org
Subject: Re: 2.6.17-mm2
Date: Wed, 28 Jun 2006 03:47:48 -0700 [thread overview]
Message-ID: <20060628034748.018eecac.akpm@osdl.org> (raw)
In-Reply-To: <20060628034215.c3008299.akpm@osdl.org>
On Wed, 28 Jun 2006 03:42:15 -0700
Andrew Morton <akpm@osdl•org> wrote:
> his is caused by the vsprintf() changes. Right now, if you do
>
> snprintf(buf, 4, "1111111111111");
>
> the memory at `buf' gets [31 31 31 31 00], which is not good.
>
> This'll plug it, but I didn't check very hard whether it still has any
> off-by-ones, or if breaks the intent of Jeremy's patch. I think it's OK..
That diff was against an older kernel and doesn't apply. This is against
mainline:
--- a/lib/vsprintf.c~vsnprintf-fix
+++ a/lib/vsprintf.c
@@ -259,7 +259,9 @@ int vsnprintf(char *buf, size_t size, co
int len;
unsigned long long num;
int i, base;
- char *str, *end, c;
+ char *str; /* Where we're writing to */
+ char *end; /* The last byte we can write to */
+ char c;
const char *s;
int flags; /* flags to number() */
@@ -283,12 +285,12 @@ int vsnprintf(char *buf, size_t size, co
}
str = buf;
- end = buf + size;
+ end = buf + size - 1;
/* Make sure end is always >= buf */
- if (end < buf) {
+ if (end < buf - 1) {
end = ((void *)-1);
- size = end - buf;
+ size = end - buf + 1;
}
for (; *fmt ; ++fmt) {
@@ -494,7 +496,6 @@ int vsnprintf(char *buf, size_t size, co
/* the trailing null byte doesn't count towards the total */
return str-buf;
}
-
EXPORT_SYMBOL(vsnprintf);
/**
_
next prev parent reply other threads:[~2006-06-28 10:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <449D5D36.3040102@google.com>
[not found] ` <449FF3A2.8010907@mbligh.org>
2006-06-27 15:37 ` 2.6.17-mm2 Martin J. Bligh
2006-06-28 10:42 ` 2.6.17-mm2 Andrew Morton
2006-06-28 10:47 ` Andrew Morton [this message]
2006-06-28 14:43 ` 2.6.17-mm2 Martin J. Bligh
2006-06-28 15:06 ` 2.6.17-mm2 Andy Whitcroft
2006-06-28 19:11 ` 2.6.17-mm2 Andrew Morton
2006-06-28 19:22 ` 2.6.17-mm2 Jeremy Fitzhardinge
2006-06-28 19:49 ` 2.6.17-mm2 Andrew Morton
2006-06-28 19:36 ` 2.6.17-mm2 Martin Bligh
2006-06-29 0:17 ` 2.6.17-mm2 Martin J. Bligh
2006-06-28 15:43 ` 2.6.17-mm2 Jeremy Fitzhardinge
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=20060628034748.018eecac.akpm@osdl.org \
--to=akpm@osdl$(echo .)org \
--cc=apw@shadowen$(echo .)org \
--cc=jeremy@goop$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc64-dev@ozlabs$(echo .)org \
--cc=mbligh@google$(echo .)com \
--cc=mbligh@mbligh$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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