Skip to content

Commit 2c4c17b

Browse files
committed
buffer: avoid overrun on UCS-2 string write
CVE-2018-12115 Discovered by ChALkeR - Сковорода Никита Андреевич Fix by Anna Henningsen Writing to the second-to-last byte with UCS-2 encoding will cause a -1 length to be send to String::Write(), writing all of the provided Buffer from that point and beyond. Fixes: nodejs-private/security#203 PR-URL: nodejs-private/node-private#138
1 parent a3f3c40 commit 2c4c17b

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

src/string_bytes.cc

+5-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,11 @@ size_t StringBytes::WriteUCS2(char* buf,
265265
size_t* chars_written) {
266266
uint16_t* const dst = reinterpret_cast<uint16_t*>(buf);
267267

268-
size_t max_chars = (buflen / sizeof(*dst));
268+
size_t max_chars = buflen / sizeof(*dst);
269+
if (max_chars == 0) {
270+
return 0;
271+
}
272+
269273
size_t nchars;
270274
size_t alignment = reinterpret_cast<uintptr_t>(dst) % sizeof(*dst);
271275
if (alignment == 0) {

test/parallel/test-buffer-write.js

+21
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,24 @@ for (let i = 1; i < 10; i++) {
7070
assert.ok(!Buffer.isEncoding(encoding));
7171
assert.throws(() => Buffer.alloc(9).write('foo', encoding), error);
7272
}
73+
74+
// UCS-2 overflow CVE-2018-12115
75+
for (let i = 1; i < 4; i++) {
76+
// Allocate two Buffers sequentially off the pool. Run more than once in case
77+
// we hit the end of the pool and don't get sequential allocations
78+
const x = Buffer.allocUnsafe(4).fill(0);
79+
const y = Buffer.allocUnsafe(4).fill(1);
80+
// Should not write anything, pos 3 doesn't have enough room for a 16-bit char
81+
assert.strictEqual(x.write('ыыыыыы', 3, 'ucs2'), 0);
82+
// CVE-2018-12115 experienced via buffer overrun to next block in the pool
83+
assert.strictEqual(Buffer.compare(y, Buffer.alloc(4, 1)), 0);
84+
}
85+
86+
// Should not write any data when there is no space for 16-bit chars
87+
const z = Buffer.alloc(4, 0);
88+
assert.strictEqual(z.write('\u0001', 3, 'ucs2'), 0);
89+
assert.strictEqual(Buffer.compare(z, Buffer.alloc(4, 0)), 0);
90+
91+
// Large overrun could corrupt the process
92+
assert.strictEqual(Buffer.alloc(4)
93+
.write('ыыыыыы'.repeat(100), 3, 'utf16le'), 0);

0 commit comments

Comments
 (0)