mirrors/byedpi
1
0
Fork 0
mirror of https://github.com/hufrea/byedpi.git synced 2024-12-22 06:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix: uninitialized padding eliminated (#137)

Browse Source
This commit is contained in:
Lurker00 2024-09-17 22:29:47 +03:00 committed by GitHub
parent 0a20d69537
commit 515129cccc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
extend.c
View File

@ -49,18 +49,24 @@ int mode_add_get(struct sockaddr_ina *dst, int m)
{ {
// m < 0: get, m > 0: set, m == 0: delete // m < 0: get, m > 0: set, m == 0: delete
assert(m >= -1 && m < params.dp_count); assert(m >= -1 && m < params.dp_count);
struct { #pragma pack(push,4)
struct key_struct {
uint16_t port; uint16_t port;
uint16_t pad0; // fill with 0 before use!
union { union {
struct in_addr i4; struct in_addr i4;
struct in6_addr i6; struct in6_addr i6;
}; };
} key = { .port = dst->in.sin_port }; } key = { .port = dst->in.sin_port, .pad0 = 0 };
#pragma pack(pop)
#if defined(__GNUC__)
_Static_assert(offsetof(struct key_struct, i4) == sizeof(key.port)+sizeof(key.pad0), "key_struct");
#endif
time_t t = 0; time_t t = 0;
struct elem *val = 0; struct elem *val = 0;
int len = sizeof(dst->in.sin_port); int len = offsetof(struct key_struct, i4);
if (dst->sa.sa_family == AF_INET) { if (dst->sa.sa_family == AF_INET) {
len += sizeof(dst->in.sin_addr); len += sizeof(dst->in.sin_addr);
key.i4 = dst->in.sin_addr; key.i4 = dst->in.sin_addr;
@ -69,7 +75,7 @@ int mode_add_get(struct sockaddr_ina *dst, int m)
len += sizeof(dst->in6.sin6_addr); len += sizeof(dst->in6.sin6_addr);
key.i6 = dst->in6.sin6_addr; key.i6 = dst->in6.sin6_addr;
} }
if (m < 0) { if (m < 0) {
val = mem_get(params.mempool, (char *)&key, len); val = mem_get(params.mempool, (char *)&key, len);
if (!val) { if (!val) {
@ -83,7 +89,7 @@ int mode_add_get(struct sockaddr_ina *dst, int m)
return val->m; return val->m;
} }
INIT_ADDR_STR((*dst)); INIT_ADDR_STR((*dst));
if (m == 0) { if (m == 0) {
LOG(LOG_S, "delete ip: %s\n", ADDR_STR); LOG(LOG_S, "delete ip: %s\n", ADDR_STR);
mem_delete(params.mempool, (char *)&key, len); mem_delete(params.mempool, (char *)&key, len);
@ -101,7 +107,6 @@ int mode_add_get(struct sockaddr_ina *dst, int m)
val->time = t; val->time = t;
return 0; return 0;
} }
} }