mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-03 07:45:50 +00:00
Code Issues Releases Wiki Activity

tests: Fix socket addr lengths in unix_socket/unix_socket_client

Browse Source 
Instead of using the entire sun_path buffer for abstract socket names,
only use the exact length of the string that is specified on the command
line. The nul-terminator is not included for abstract sockets.

The size of sun_path is modified to include the nul-terminator for
pathname address types.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Acked-by: Steve Beattie <steve@nxnw.org>
This commit is contained in:
Tyler Hicks
2014-09-22 18:15:01 -05:00
parent eea15ce54b
commit 3fb09b20f2
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/regression/apparmor/unix_socket.c
View File

@@ -107,11 +107,20 @@ int main (int argc, char *argv[])
sun_path = argv[1]; sun_path = argv[1];
sun_path_len = strlen(sun_path); sun_path_len = strlen(sun_path);
if (sun_path[0] == '@') { if (sun_path[0] == '@') {
if (sun_path_len > sizeof(addr.sun_path)) {
fprintf(stderr, "FAIL - socket addr too big\n");
exit(1);
}
memcpy(addr.sun_path, sun_path, sun_path_len); memcpy(addr.sun_path, sun_path, sun_path_len);
addr.sun_path[0] = '\0'; addr.sun_path[0] = '\0';
sun_path_len = sizeof(addr.sun_path);
} else { } else {
memcpy(addr.sun_path, sun_path, sun_path_len + 1); /* include the nul terminator for pathname addr types */
sun_path_len++;
if (sun_path_len > sizeof(addr.sun_path)) {
fprintf(stderr, "FAIL - socket addr too big\n");
exit(1);
}
memcpy(addr.sun_path, sun_path, sun_path_len);
} }
if (!strcmp(argv[2], "stream")) { if (!strcmp(argv[2], "stream")) {

13
tests/regression/apparmor/unix_socket_client.c
View File

@@ -98,11 +98,20 @@ int main(int argc, char *argv[])
sun_path = argv[1]; sun_path = argv[1];
sun_path_len = strlen(sun_path); sun_path_len = strlen(sun_path);
if (sun_path[0] == '@') { if (sun_path[0] == '@') {
if (sun_path_len > sizeof(peer_addr.sun_path)) {
fprintf(stderr, "FAIL CLIENT - socket addr too big\n");
exit(1);
}
memcpy(peer_addr.sun_path, sun_path, sun_path_len); memcpy(peer_addr.sun_path, sun_path, sun_path_len);
peer_addr.sun_path[0] = '\0'; peer_addr.sun_path[0] = '\0';
sun_path_len = sizeof(peer_addr.sun_path);
} else { } else {
memcpy(peer_addr.sun_path, sun_path, sun_path_len + 1); /* include the nul terminator for pathname addr types */
sun_path_len++;
if (sun_path_len > sizeof(peer_addr.sun_path)) {
fprintf(stderr, "FAIL CLIENT - socket addr too big\n");
exit(1);
}
memcpy(peer_addr.sun_path, sun_path, sun_path_len);
} }
if (!strcmp(argv[2], "stream")) { if (!strcmp(argv[2], "stream")) {