RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2024-12-26 16:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of oss.tresys.com:/home/git/selinux

Browse Source
This commit is contained in:
Joshua Brindle 2010-03-12 08:33:37 -05:00
commit 78bc1a58bc
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libselinux/man/man3/avc_netlink_loop.3
View File

@ -41,12 +41,9 @@ descriptor is stored internally; use
.BR avc_netlink_acquire_fd (3)
to take ownership of it in application code. The
.I blocking
argument specifies whether read operations on the socket will block.
argument controls whether the O_NONBLOCK flag is set on the socket descriptor.
.BR avc_open (3)
calls this function internally, specifying non-blocking behavior (unless
threading callbacks were explicitly set using the deprecated
.BR avc_init (3)
interface, in which case blocking behavior is set).
calls this function internally, specifying non-blocking behavior.
.B avc_netlink_close
closes the netlink socket. This function is called automatically by
@ -66,9 +63,7 @@ checks the netlink socket for pending messages and processes them.
Callbacks for policyload and enforcing changes will be called;
see
.BR selinux_set_callback (3).
This function does not block unless
.BR avc_netlink_open (3)
specified blocking behavior.
This function does not block.
.B avc_netlink_loop
enters a loop blocking on the netlink socket and processing messages as they

2
libselinux/src/avc.c
View File

@ -222,7 +222,7 @@ int avc_init(const char *prefix,
avc_enforcing = rc;
}
rc = avc_netlink_open(avc_using_threads);
rc = avc_netlink_open(0);
if (rc < 0) {
avc_log(SELINUX_ERROR,
"%s: can't open netlink socket: %d (%s)\n",

20
libselinux/src/avc_internal.c
View File

@ -15,6 +15,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <string.h>
#include <poll.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <linux/types.h>
@ -92,13 +93,26 @@ void avc_netlink_close(void)
close(fd);
}
static int avc_netlink_receive(char *buf, unsigned buflen)
static int avc_netlink_receive(char *buf, unsigned buflen, int blocking)
{
int rc;
struct pollfd pfd = { fd, POLLIN | POLLPRI, 0 };
struct sockaddr_nl nladdr;
socklen_t nladdrlen = sizeof nladdr;
struct nlmsghdr *nlh = (struct nlmsghdr *)buf;
rc = poll(&pfd, 1, (blocking ? -1 : 0));
if (rc == 0 && !blocking) {
errno = EWOULDBLOCK;
return -1;
}
else if (rc < 1) {
avc_log(SELINUX_ERROR, "%s: netlink poll: error %d\n",
avc_prefix, errno);
return rc;
}
rc = recvfrom(fd, buf, buflen, 0, (struct sockaddr *)&nladdr,
&nladdrlen);
if (rc < 0)
@ -208,7 +222,7 @@ int avc_netlink_check_nb(void)
while (1) {
errno = 0;
rc = avc_netlink_receive(buf, sizeof(buf));
rc = avc_netlink_receive(buf, sizeof(buf), 0);
if (rc < 0) {
if (errno == EWOULDBLOCK)
return 0;
@ -235,7 +249,7 @@ void avc_netlink_loop(void)
while (1) {
errno = 0;
rc = avc_netlink_receive(buf, sizeof(buf));
rc = avc_netlink_receive(buf, sizeof(buf), 1);
if (rc < 0) {
if (errno == 0 || errno == EINTR)
continue;