GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 08:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Always use the native endianness.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-05-31 22:09:09 +02:00
parent ade4f84e70
commit 0c21e47f85
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main-ctl-unix.c
View File

@@ -629,7 +629,7 @@ static void ctl_handle_commands(main_server_st * s)
} }
goto cleanup; goto cleanup;
} }
length = (buffer[2] << 8) | buffer[1]; memcpy(&length, &buffer[1], 2);
buffer_size = ret - 3; buffer_size = ret - 3;
if (length != buffer_size) { if (length != buffer_size) {

7
src/occtl-unix.c
View File

@@ -83,15 +83,14 @@ int send_cmd(struct unix_ctx *ctx, unsigned cmd, const void *data,
struct iovec iov[2]; struct iovec iov[2];
unsigned iov_len = 1; unsigned iov_len = 1;
int e, ret; int e, ret;
unsigned length = 0; uint16_t length = 0;
void *packed = NULL; void *packed = NULL;
if (get_size) if (get_size)
length = get_size(data); length = get_size(data);
header[0] = cmd; header[0] = cmd;
header[1] = length; memcpy(&header[1], &length, 2);
header[2] = length >> 8;
iov[0].iov_base = header; iov[0].iov_base = header;
iov[0].iov_len = 3; iov[0].iov_len = 3;
@@ -145,7 +144,7 @@ int send_cmd(struct unix_ctx *ctx, unsigned cmd, const void *data,
goto fail; goto fail;
} }
length = (header[2] << 8) | header[1]; memcpy(&length, &header[1], 2);
rep->data_size = length; rep->data_size = length;
rep->data = talloc_size(ctx, length); rep->data = talloc_size(ctx, length);

6
src/sec-mod.c
View File

@@ -354,6 +354,7 @@ void sec_mod_server(void *main_pool, struct cfg_st *config, const char *socket_f
unsigned cmd, length; unsigned cmd, length;
unsigned i, buffer_size; unsigned i, buffer_size;
uint8_t *buffer, *tpool; uint8_t *buffer, *tpool;
uint16_t l16;
struct pin_st pins; struct pin_st pins;
int sd; int sd;
sec_mod_st *sec; sec_mod_st *sec;
@@ -538,10 +539,11 @@ void sec_mod_server(void *main_pool, struct cfg_st *config, const char *socket_f
} }
cmd = buffer[0]; cmd = buffer[0];
length = buffer[1] | buffer[2] << 8; memcpy(&l16, &buffer[1], 2);
length = l16;
if (length > buffer_size - 4) { if (length > buffer_size - 4) {
seclog(LOG_INFO, "too big message"); seclog(LOG_INFO, "too big message (%d)", length);
goto cont; goto cont;
} }