andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Xext: Use general OS functions to determine client command string in SELinux.

Browse Source 
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
This commit is contained in:
Rami Ylimäki 2010-12-22 16:57:17 +02:00
parent 1e933665be
commit 296561506a
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Xext/xselinux_hooks.c
View File

@ -40,6 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "propertyst.h"
#include "extnsionst.h"
#include "xacestr.h"
#include "client.h"
#include "../os/osdep.h"
#define _XSELINUX_NEED_FLASK_MAP
#include "xselinuxint.h"
@ -129,26 +130,25 @@ SELinuxLabelClient(ClientPtr client)
/* For local clients, try and determine the executable name */
if (XaceIsLocal(client)) {
struct ucred creds;
socklen_t len = sizeof(creds);
char path[PATH_MAX + 1];
size_t bytes;
/* Get cached command name if CLIENTIDS is enabled. */
const char *cmdname = GetClientCmdName(client);
Bool cached = (cmdname != NULL);
/* If CLIENTIDS is disabled, figure out the command name from
* scratch. */
if (!cmdname)
{
pid_t pid = DetermineClientPid(client);
if (pid != -1)
DetermineClientCmd(pid, &cmdname, NULL);
}
memset(&creds, 0, sizeof(creds));
if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &creds, &len) < 0)
if (!cmdname)
goto finish;
snprintf(path, PATH_MAX + 1, "/proc/%d/cmdline", creds.pid);
fd = open(path, O_RDONLY);
if (fd < 0)
goto finish;
strncpy(subj->command, cmdname, COMMAND_LEN - 1);
bytes = read(fd, path, PATH_MAX + 1);
close(fd);
if (bytes <= 0)
goto finish;
strncpy(subj->command, path, COMMAND_LEN - 1);
if (!cached)
free((void *) cmdname); /* const char * */
}
finish: