Mercurial > hg > nginx
annotate src/core/ngx_murmurhash.c @ 7146:5c25f01bbd52 stable-1.12
Fixed handling of non-null-terminated unix sockets.
At least FreeBSD, macOS, NetBSD, and OpenBSD can return unix sockets
with non-null-terminated sun_path. Additionally, the address may become
non-null-terminated if it does not fit into the buffer provided and was
truncated (may happen on macOS, NetBSD, and Solaris, which allow unix socket
addresess larger than struct sockaddr_un). As such, ngx_sock_ntop() might
overread the sockaddr provided, as it used "%s" format and thus assumed
null-terminated string.
To fix this, the ngx_strnlen() function was introduced, and it is now used
to calculate correct length of sun_path.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 04 Oct 2017 21:19:38 +0300 |
parents | d409ab1e8e4d |
children |
rev | line source |
---|---|
3891 | 1 |
2 /* | |
3 * Copyright (C) Austin Appleby | |
4 */ | |
5 | |
6 | |
7 #include <ngx_config.h> | |
8 #include <ngx_core.h> | |
9 | |
10 | |
11 uint32_t | |
12 ngx_murmur_hash2(u_char *data, size_t len) | |
13 { | |
14 uint32_t h, k; | |
15 | |
16 h = 0 ^ len; | |
17 | |
18 while (len >= 4) { | |
19 k = data[0]; | |
20 k |= data[1] << 8; | |
21 k |= data[2] << 16; | |
22 k |= data[3] << 24; | |
23 | |
24 k *= 0x5bd1e995; | |
25 k ^= k >> 24; | |
26 k *= 0x5bd1e995; | |
27 | |
28 h *= 0x5bd1e995; | |
29 h ^= k; | |
30 | |
31 data += 4; | |
32 len -= 4; | |
33 } | |
34 | |
35 switch (len) { | |
36 case 3: | |
37 h ^= data[2] << 16; | |
7136
d409ab1e8e4d
Added missing "fall through" comments (ticket #1259).
Maxim Dounin <mdounin@mdounin.ru>
parents:
3891
diff
changeset
|
38 /* fall through */ |
3891 | 39 case 2: |
40 h ^= data[1] << 8; | |
7136
d409ab1e8e4d
Added missing "fall through" comments (ticket #1259).
Maxim Dounin <mdounin@mdounin.ru>
parents:
3891
diff
changeset
|
41 /* fall through */ |
3891 | 42 case 1: |
43 h ^= data[0]; | |
44 h *= 0x5bd1e995; | |
45 } | |
46 | |
47 h ^= h >> 13; | |
48 h *= 0x5bd1e995; | |
49 h ^= h >> 15; | |
50 | |
51 return h; | |
52 } |