Minix/rpi_b
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

align <sys/ucontext.h> <sys/uio.h> <sys/un.h>

Browse Source 
Change-Id: I70adf01fddf931a3a6931083adaa4bbe647ea6a3
This commit is contained in:
Ben Gras
2014-03-03 20:47:03 +01:00
committed by sambuc
parent 01624e6f86
commit 17587738d3
15 changed files with 274 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/uds/ioc_uds.c
+9 -7
View File
@@ -69,7 +69,8 @@ do_accept(devminor_t minor, endpoint_t endpt, cp_grant_id_t grant)
for (i = 0; i < NR_FDS; i++) {
if (uds_fd_table[i].addr.sun_family == AF_UNIX &&
!strncmp(addr.sun_path, uds_fd_table[i].addr.sun_path,
UNIX_PATH_MAX) && uds_fd_table[i].listening == 1)
sizeof(uds_fd_table[i].addr.sun_path)) &&
uds_fd_table[i].listening == 1)
break;
}
@@ -167,7 +168,7 @@ do_connect(devminor_t minor, endpoint_t endpt, cp_grant_id_t grant)
return rc;
if ((rc = checkperms(uds_fd_table[minor].owner, addr.sun_path,
UNIX_PATH_MAX)) != OK)
sizeof(addr.sun_path))) != OK)
return rc;
/*
@@ -182,7 +183,7 @@ do_connect(devminor_t minor, endpoint_t endpt, cp_grant_id_t grant)
if (uds_fd_table[i].addr.sun_family != AF_UNIX)
continue;
if (strncmp(addr.sun_path, uds_fd_table[i].addr.sun_path,
UNIX_PATH_MAX))
sizeof(uds_fd_table[i].addr.sun_path)))
continue;
/* Found a matching socket. */
@@ -356,14 +357,14 @@ do_bind(devminor_t minor, endpoint_t endpt, cp_grant_id_t grant)
return ENOENT;
if ((rc = checkperms(uds_fd_table[minor].owner, addr.sun_path,
UNIX_PATH_MAX)) != OK)
sizeof(addr.sun_path))) != OK)
return rc;
/* Make sure the address isn't already in use by another socket. */
for (i = 0; i < NR_FDS; i++) {
if (uds_fd_table[i].addr.sun_family == AF_UNIX &&
!strncmp(addr.sun_path, uds_fd_table[i].addr.sun_path,
UNIX_PATH_MAX)) {
sizeof(uds_fd_table[i].addr.sun_path))) {
/* Another socket is bound to this sun_path. */
return EADDRINUSE;
}
@@ -612,7 +613,7 @@ do_sendto(devminor_t minor, endpoint_t endpt, cp_grant_id_t grant)
return EINVAL;
if ((rc = checkperms(uds_fd_table[minor].owner, addr.sun_path,
UNIX_PATH_MAX)) != OK)
sizeof(addr.sun_path))) != OK)
return rc;
memcpy(&uds_fd_table[minor].target, &addr, sizeof(struct sockaddr_un));
@@ -826,7 +827,8 @@ do_sendmsg(devminor_t minor, endpoint_t endpt, cp_grant_id_t grant)
if (uds_fd_table[i].type == SOCK_DGRAM &&
uds_fd_table[i].addr.sun_family == AF_UNIX &&
!strncmp(uds_fd_table[minor].target.sun_path,
uds_fd_table[i].addr.sun_path, UNIX_PATH_MAX)) {
uds_fd_table[i].addr.sun_path,
sizeof(uds_fd_table[i].addr.sun_path))) {
peer = i;
break;
}
drivers/uds/uds.c
+2 -1
View File
@@ -391,7 +391,8 @@ uds_perform_write(devminor_t minor, endpoint_t endpt, cp_grant_id_t grant,
if (uds_fd_table[i].type == SOCK_DGRAM &&
uds_fd_table[i].addr.sun_family == AF_UNIX &&
!strncmp(uds_fd_table[minor].target.sun_path,
uds_fd_table[i].addr.sun_path, UNIX_PATH_MAX)) {
uds_fd_table[i].addr.sun_path,
sizeof(uds_fd_table[i].addr.sun_path))) {
peer = i;
break;
}