diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2009-04-24 04:11:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-16 00:44:43 -0400 |
commit | 905c02acbd89f427c87a6d0a50fed757f6b3001c (patch) | |
tree | a4844dac7cd7bbce34ab33295eaa402d996e9b48 /fs | |
parent | e27ecdd94d81e5bc3d1f68591701db5adb342f0d (diff) |
nls: utf8_wcstombs: fix buffer overflow
utf8_wcstombs forgot to include one-byte UTF-8 characters when
calculating the output buffer size, i.e., theoretically, it was possible
to overflow the output buffer with an input string that contains enough
ASCII characters.
In practice, this was no problem because the only user so far (VFAT)
always uses a big enough output buffer.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nls/nls_base.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c index 000736d89c95..750abf211e26 100644 --- a/fs/nls/nls_base.c +++ b/fs/nls/nls_base.c | |||
@@ -150,6 +150,7 @@ utf8_wcstombs(__u8 *s, const wchar_t *pwcs, int maxlen) | |||
150 | } | 150 | } |
151 | } else { | 151 | } else { |
152 | *op++ = (__u8) *ip; | 152 | *op++ = (__u8) *ip; |
153 | maxlen--; | ||
153 | } | 154 | } |
154 | ip++; | 155 | ip++; |
155 | } | 156 | } |