mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-22 04:10:48 +00:00
853926a9ac
As reported in issue #689, there is a subtle bug in the ebtree code used to compared memory blocks. It stems from the platform-dependent memcmp() implementation. Original implementations used to perform a byte-per-byte comparison and to stop at the first non-matching byte, as in this old example: https://www.retro11.de/ouxr/211bsd/usr/src/lib/libc/compat-sys5/memcmp.c.html The ebtree code has been relying on this to detect the first non-matching byte when comparing keys. This is made so that a zero-terminated string can fail to match against a longer string. Over time, especially with large busses and SIMD instruction sets, multi-byte comparisons have appeared, making the processor fetch bytes past the first different byte, which could possibly be a trailing zero. This means that it's possible to read past the allocated area for a string if it was allocated by strdup(). This is not correct and definitely confuses address sanitizers. In real life the problem doesn't have visible consequences. Indeed, multi-byte comparisons are implemented so that aligned words are loaded (e.g. 512 bits at once to process a cache line at a time). So there is no way such a multi-byte access will cross a page boundary and end up reading from an unallocated zone. This is why it was never noticed before. This patch addresses this by implementing a one-byte-at-a-time memcmp() variant for ebtree, called eb_memcmp(). It's optimized for both small and long strings and guarantees to stop after the first non-matching byte. It only needs 5 instructions in the loop and was measured to be 3.2 times faster than the glibc's AVX2-optimized memcmp() on short strings (1 to 257 bytes), since that latter one comes with a significant setup cost. The break-even seems to be at 512 bytes where both version perform equally, which is way longer than what's used in general here. This fix should be backported to stable versions and reintegrated into the ebtree code.
51 lines
1.6 KiB
C
51 lines
1.6 KiB
C
/*
|
|
* Elastic Binary Trees - exported generic functions
|
|
* Version 6.0.6
|
|
* (C) 2002-2011 - Willy Tarreau <w@1wt.eu>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation, version 2.1
|
|
* exclusively.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include <import/ebtree.h>
|
|
|
|
void eb_delete(struct eb_node *node)
|
|
{
|
|
__eb_delete(node);
|
|
}
|
|
|
|
/* used by insertion primitives */
|
|
struct eb_node *eb_insert_dup(struct eb_node *sub, struct eb_node *new)
|
|
{
|
|
return __eb_insert_dup(sub, new);
|
|
}
|
|
|
|
/* compares memory blocks m1 and m2 for up to <len> bytes. Immediately stops at
|
|
* the first non-matching byte. It returns 0 on full match, non-zero otherwise.
|
|
* One byte will always be checked so this must not be called with len==0. It
|
|
* takes 2+5cy/B on x86_64 and is ~29 bytes long.
|
|
*/
|
|
int eb_memcmp(const void *m1, const void *m2, size_t len)
|
|
{
|
|
const char *p1 = (const char *)m1 + len;
|
|
const char *p2 = (const char *)m2 + len;
|
|
ssize_t ofs = -len;
|
|
char diff;
|
|
|
|
do {
|
|
diff = p1[ofs] - p2[ofs];
|
|
} while (!diff && ++ofs);
|
|
return diff;
|
|
}
|