frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xselinux: Remove "X" prefix on remaining functions and strings. 

Should be evident from the context.
This commit is contained in:
Eamon Walsh 2007-12-28 13:26:26 -05:00 committed by Eamon Walsh
parent f4bc333fc1
commit 643c52be32
4 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Xext/xselinux.c
View File

@ -175,12 +175,12 @@ SELinuxSelectionToSID(Atom selection, SELinuxStateRec *sid_return)
security_id_t sid; security_id_t sid;
if (selabel_lookup(label_hnd, &con, name, SELABEL_X_SELN) < 0) { if (selabel_lookup(label_hnd, &con, name, SELABEL_X_SELN) < 0) {
ErrorF("XSELinux: a selection label lookup failed!\n"); ErrorF("SELinux: a selection label lookup failed!\n");
return BadValue; return BadValue;
} }
/* Get a SID for context */ /* Get a SID for context */
if (avc_context_to_sid(con, &sid) < 0) { if (avc_context_to_sid(con, &sid) < 0) {
ErrorF("XSELinux: a context_to_SID call failed!\n"); ErrorF("SELinux: a context_to_SID call failed!\n");
return BadAlloc; return BadAlloc;
} }
freecon(con); freecon(con);
@ -216,12 +216,12 @@ SELinuxEventToSID(unsigned type, security_id_t sid_of_window,
if (!knownEvents[type]) { if (!knownEvents[type]) {
/* Look in the mappings of event names to contexts */ /* Look in the mappings of event names to contexts */
if (selabel_lookup(label_hnd, &con, name, SELABEL_X_EVENT) < 0) { if (selabel_lookup(label_hnd, &con, name, SELABEL_X_EVENT) < 0) {
ErrorF("XSELinux: an event label lookup failed!\n"); ErrorF("SELinux: an event label lookup failed!\n");
return BadValue; return BadValue;
} }
/* Get a SID for context */ /* Get a SID for context */
if (avc_context_to_sid(con, knownEvents + type) < 0) { if (avc_context_to_sid(con, knownEvents + type) < 0) {
ErrorF("XSELinux: a context_to_SID call failed!\n"); ErrorF("SELinux: a context_to_SID call failed!\n");
return BadAlloc; return BadAlloc;
} }
freecon(con); freecon(con);
@ -230,7 +230,7 @@ SELinuxEventToSID(unsigned type, security_id_t sid_of_window,
/* Perform a transition to obtain the final SID */ /* Perform a transition to obtain the final SID */
if (avc_compute_create(sid_of_window, knownEvents[type], SECCLASS_X_EVENT, if (avc_compute_create(sid_of_window, knownEvents[type], SECCLASS_X_EVENT,
&sid_return->sid) < 0) { &sid_return->sid) < 0) {
ErrorF("XSELinux: a compute_create call failed!\n"); ErrorF("SELinux: a compute_create call failed!\n");
return BadValue; return BadValue;
} }
@ -607,13 +607,13 @@ SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
/* Look in the mappings of property names to contexts */ /* Look in the mappings of property names to contexts */
if (selabel_lookup(label_hnd, &con, name, SELABEL_X_EXT) < 0) { if (selabel_lookup(label_hnd, &con, name, SELABEL_X_EXT) < 0) {
ErrorF("XSELinux: a property label lookup failed!\n"); ErrorF("SELinux: a property label lookup failed!\n");
rec->status = BadValue; rec->status = BadValue;
return; return;
} }
/* Get a SID for context */ /* Get a SID for context */
if (avc_context_to_sid(con, &sid) < 0) { if (avc_context_to_sid(con, &sid) < 0) {
ErrorF("XSELinux: a context_to_SID call failed!\n"); ErrorF("SELinux: a context_to_SID call failed!\n");
rec->status = BadAlloc; rec->status = BadAlloc;
return; return;
} }
@ -623,7 +623,7 @@ SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
/* Perform a transition to obtain the final SID */ /* Perform a transition to obtain the final SID */
if (avc_compute_create(serv->sid, sid, SECCLASS_X_EXTENSION, if (avc_compute_create(serv->sid, sid, SECCLASS_X_EXTENSION,
&obj->sid) < 0) { &obj->sid) < 0) {
ErrorF("XSELinux: a SID transition call failed!\n"); ErrorF("SELinux: a SID transition call failed!\n");
freecon(con); freecon(con);
rec->status = BadValue; rec->status = BadValue;
return; return;
@ -658,13 +658,13 @@ SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
/* Look in the mappings of property names to contexts */ /* Look in the mappings of property names to contexts */
if (selabel_lookup(label_hnd, &con, name, SELABEL_X_PROP) < 0) { if (selabel_lookup(label_hnd, &con, name, SELABEL_X_PROP) < 0) {
ErrorF("XSELinux: a property label lookup failed!\n"); ErrorF("SELinux: a property label lookup failed!\n");
rec->status = BadValue; rec->status = BadValue;
return; return;
} }
/* Get a SID for context */ /* Get a SID for context */
if (avc_context_to_sid(con, &sid) < 0) { if (avc_context_to_sid(con, &sid) < 0) {
ErrorF("XSELinux: a context_to_SID call failed!\n"); ErrorF("SELinux: a context_to_SID call failed!\n");
rec->status = BadAlloc; rec->status = BadAlloc;
return; return;
} }
@ -674,7 +674,7 @@ SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
/* Perform a transition to obtain the final SID */ /* Perform a transition to obtain the final SID */
if (avc_compute_create(subj->sid, sid, SECCLASS_X_PROPERTY, if (avc_compute_create(subj->sid, sid, SECCLASS_X_PROPERTY,
&obj->sid) < 0) { &obj->sid) < 0) {
ErrorF("XSELinux: a SID transition call failed!\n"); ErrorF("SELinux: a SID transition call failed!\n");
freecon(con); freecon(con);
rec->status = BadValue; rec->status = BadValue;
return; return;
@ -732,7 +732,7 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
/* Perform a transition to obtain the final SID */ /* Perform a transition to obtain the final SID */
if (avc_compute_create(subj->sid, pobj->sid, class, &obj->sid) < 0) { if (avc_compute_create(subj->sid, pobj->sid, class, &obj->sid) < 0) {
ErrorF("XSELinux: a compute_create call failed!\n"); ErrorF("SELinux: a compute_create call failed!\n");
rec->status = BadValue; rec->status = BadValue;
return; return;
} }
@ -766,7 +766,7 @@ SELinuxScreen(CallbackListPtr *pcbl, pointer is_saver, pointer calldata)
/* Perform a transition to obtain the final SID */ /* Perform a transition to obtain the final SID */
if (avc_compute_create(subj->sid, subj->sid, SECCLASS_X_SCREEN, if (avc_compute_create(subj->sid, subj->sid, SECCLASS_X_SCREEN,
&obj->sid) < 0) { &obj->sid) < 0) {
ErrorF("XSELinux: a compute_create call failed!\n"); ErrorF("SELinux: a compute_create call failed!\n");
rec->status = BadValue; rec->status = BadValue;
return; return;
} }
@ -883,16 +883,16 @@ SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
security_context_t ctx; security_context_t ctx;
int rc = avc_sid_to_context(state->sid, &ctx); int rc = avc_sid_to_context(state->sid, &ctx);
if (rc < 0) if (rc < 0)
FatalError("XSELinux: Failed to get security context!\n"); FatalError("SELinux: Failed to get security context!\n");
rc = dixChangeWindowProperty(serverClient, rc = dixChangeWindowProperty(serverClient,
pWin, atom_client_ctx, XA_STRING, 8, pWin, atom_client_ctx, XA_STRING, 8,
PropModeReplace, strlen(ctx), ctx, FALSE); PropModeReplace, strlen(ctx), ctx, FALSE);
if (rc != Success) if (rc != Success)
FatalError("XSELinux: Failed to set label property on window!\n"); FatalError("SELinux: Failed to set label property on window!\n");
freecon(ctx); freecon(ctx);
} }
else else
FatalError("XSELinux: Unexpected unlabeled client found\n"); FatalError("SELinux: Unexpected unlabeled client found\n");
state = dixLookupPrivate(&pWin->devPrivates, stateKey); state = dixLookupPrivate(&pWin->devPrivates, stateKey);
@ -900,16 +900,16 @@ SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
security_context_t ctx; security_context_t ctx;
int rc = avc_sid_to_context(state->sid, &ctx); int rc = avc_sid_to_context(state->sid, &ctx);
if (rc < 0) if (rc < 0)
FatalError("XSELinux: Failed to get security context!\n"); FatalError("SELinux: Failed to get security context!\n");
rc = dixChangeWindowProperty(serverClient, rc = dixChangeWindowProperty(serverClient,
pWin, atom_ctx, XA_STRING, 8, pWin, atom_ctx, XA_STRING, 8,
PropModeReplace, strlen(ctx), ctx, FALSE); PropModeReplace, strlen(ctx), ctx, FALSE);
if (rc != Success) if (rc != Success)
FatalError("XSELinux: Failed to set label property on window!\n"); FatalError("SELinux: Failed to set label property on window!\n");
freecon(ctx); freecon(ctx);
} }
else else
FatalError("XSELinux: Unexpected unlabeled window found\n"); FatalError("SELinux: Unexpected unlabeled window found\n");
} }
static void static void
@ -931,7 +931,7 @@ SELinuxSelectionState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
if (avc_compute_create(subj->sid, subj->sid, SECCLASS_X_SELECTION, if (avc_compute_create(subj->sid, subj->sid, SECCLASS_X_SELECTION,
&obj->sid) < 0) { &obj->sid) < 0) {
ErrorF("XSELinux: a compute_create call failed!\n"); ErrorF("SELinux: a compute_create call failed!\n");
obj->sid = unlabeled_sid; obj->sid = unlabeled_sid;
} }
break; break;
@ -998,8 +998,8 @@ ProcSELinuxQueryVersion(ClientPtr client)
rep.type = X_Reply; rep.type = X_Reply;
rep.length = 0; rep.length = 0;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
rep.server_major = XSELINUX_MAJOR_VERSION; rep.server_major = SELINUX_MAJOR_VERSION;
rep.server_minor = XSELINUX_MINOR_VERSION; rep.server_minor = SELINUX_MINOR_VERSION;
if (client->swapped) { if (client->swapped) {
int n; int n;
swaps(&rep.sequenceNumber, n); swaps(&rep.sequenceNumber, n);
@ -1367,7 +1367,7 @@ SELinuxResetProc(ExtensionEntry *extEntry)
} }
void void
XSELinuxExtensionInit(INITARGS) SELinuxExtensionInit(INITARGS)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
struct selinux_opt options[] = { { SELABEL_OPT_VALIDATE, (char *)1 } }; struct selinux_opt options[] = { { SELABEL_OPT_VALIDATE, (char *)1 } };
@ -1376,7 +1376,7 @@ XSELinuxExtensionInit(INITARGS)
/* Setup SELinux stuff */ /* Setup SELinux stuff */
if (!is_selinux_enabled()) { if (!is_selinux_enabled()) {
ErrorF("XSELinux: SELinux not enabled, disabling SELinux support.\n"); ErrorF("SELinux: SELinux not enabled, disabling SELinux support.\n");
return; return;
} }
@ -1385,42 +1385,42 @@ XSELinuxExtensionInit(INITARGS)
if (selinux_set_mapping(map) < 0) { if (selinux_set_mapping(map) < 0) {
if (errno == EINVAL) { if (errno == EINVAL) {
ErrorF("XSELinux: Invalid object class mapping, disabling SELinux support.\n"); ErrorF("SELinux: Invalid object class mapping, disabling SELinux support.\n");
return; return;
} }
FatalError("XSELinux: Failed to set up security class mapping\n"); FatalError("SELinux: Failed to set up security class mapping\n");
} }
if (avc_open(NULL, 0) < 0) if (avc_open(NULL, 0) < 0)
FatalError("XSELinux: Couldn't initialize SELinux userspace AVC\n"); FatalError("SELinux: Couldn't initialize SELinux userspace AVC\n");
avc_active = 1; avc_active = 1;
label_hnd = selabel_open(SELABEL_CTX_X, options, 1); label_hnd = selabel_open(SELABEL_CTX_X, options, 1);
if (!label_hnd) if (!label_hnd)
FatalError("XSELinux: Failed to open x_contexts mapping in policy\n"); FatalError("SELinux: Failed to open x_contexts mapping in policy\n");
if (security_get_initial_context("unlabeled", &con) < 0) if (security_get_initial_context("unlabeled", &con) < 0)
FatalError("XSELinux: Failed to look up unlabeled context\n"); FatalError("SELinux: Failed to look up unlabeled context\n");
if (avc_context_to_sid(con, &unlabeled_sid) < 0) if (avc_context_to_sid(con, &unlabeled_sid) < 0)
FatalError("XSELinux: a context_to_SID call failed!\n"); FatalError("SELinux: a context_to_SID call failed!\n");
freecon(con); freecon(con);
/* Prepare for auditing */ /* Prepare for auditing */
audit_fd = audit_open(); audit_fd = audit_open();
if (audit_fd < 0) if (audit_fd < 0)
FatalError("XSELinux: Failed to open the system audit log\n"); FatalError("SELinux: Failed to open the system audit log\n");
/* Allocate private storage */ /* Allocate private storage */
if (!dixRequestPrivate(stateKey, sizeof(SELinuxStateRec))) if (!dixRequestPrivate(stateKey, sizeof(SELinuxStateRec)))
FatalError("XSELinux: Failed to allocate private storage.\n"); FatalError("SELinux: Failed to allocate private storage.\n");
/* Create atoms for doing window labeling */ /* Create atoms for doing window labeling */
atom_ctx = MakeAtom("_SELINUX_CONTEXT", 16, TRUE); atom_ctx = MakeAtom("_SELINUX_CONTEXT", 16, TRUE);
if (atom_ctx == BAD_RESOURCE) if (atom_ctx == BAD_RESOURCE)
FatalError("XSELinux: Failed to create atom\n"); FatalError("SELinux: Failed to create atom\n");
atom_client_ctx = MakeAtom("_SELINUX_CLIENT_CONTEXT", 23, TRUE); atom_client_ctx = MakeAtom("_SELINUX_CLIENT_CONTEXT", 23, TRUE);
if (atom_client_ctx == BAD_RESOURCE) if (atom_client_ctx == BAD_RESOURCE)
FatalError("XSELinux: Failed to create atom\n"); FatalError("SELinux: Failed to create atom\n");
/* Register callbacks */ /* Register callbacks */
ret &= dixRegisterPrivateInitFunc(stateKey, SELinuxStateInit, NULL); ret &= dixRegisterPrivateInitFunc(stateKey, SELinuxStateInit, NULL);
@ -1443,11 +1443,11 @@ XSELinuxExtensionInit(INITARGS)
ret &= XaceRegisterCallback(XACE_SCREEN_ACCESS, SELinuxScreen, NULL); ret &= XaceRegisterCallback(XACE_SCREEN_ACCESS, SELinuxScreen, NULL);
ret &= XaceRegisterCallback(XACE_SCREENSAVER_ACCESS, SELinuxScreen, truep); ret &= XaceRegisterCallback(XACE_SCREENSAVER_ACCESS, SELinuxScreen, truep);
if (!ret) if (!ret)
FatalError("XSELinux: Failed to register one or more callbacks\n"); FatalError("SELinux: Failed to register one or more callbacks\n");
/* Add extension to server */ /* Add extension to server */
extEntry = AddExtension(XSELINUX_EXTENSION_NAME, extEntry = AddExtension(SELINUX_EXTENSION_NAME,
XSELinuxNumberEvents, XSELinuxNumberErrors, SELinuxNumberEvents, SELinuxNumberErrors,
ProcSELinuxDispatch, SProcSELinuxDispatch, ProcSELinuxDispatch, SProcSELinuxDispatch,
SELinuxResetProc, StandardMinorOpcode); SELinuxResetProc, StandardMinorOpcode);

10
Xext/xselinux.h
View File

@ -23,11 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "dixaccess.h" #include "dixaccess.h"
/* Extension info */ /* Extension info */
#define XSELINUX_EXTENSION_NAME "SELinux" #define SELINUX_EXTENSION_NAME "SELinux"
#define XSELINUX_MAJOR_VERSION 1 #define SELINUX_MAJOR_VERSION 1
#define XSELINUX_MINOR_VERSION 0 #define SELINUX_MINOR_VERSION 0
#define XSELinuxNumberEvents 0 #define SELinuxNumberEvents 0
#define XSELinuxNumberErrors 0 #define SELinuxNumberErrors 0
/* Extension protocol */ /* Extension protocol */
#define X_SELinuxQueryVersion 0 #define X_SELinuxQueryVersion 0

2
hw/xfree86/dixmods/extmod/modinit.h
View File

@ -130,7 +130,7 @@ extern void XaceExtensionInit(INITARGS);
#endif #endif
#ifdef XSELINUX #ifdef XSELINUX
extern void XSELinuxExtensionInit(INITARGS); extern void SELinuxExtensionInit(INITARGS);
#endif #endif
#if 1 #if 1

6
mi/miinitext.c
View File

@ -330,7 +330,7 @@ extern void XaceExtensionInit(INITARGS);
extern void SecurityExtensionInit(INITARGS); extern void SecurityExtensionInit(INITARGS);
#endif #endif
#ifdef XSELINUX #ifdef XSELINUX
extern void XSELinuxExtensionInit(INITARGS); extern void SELinuxExtensionInit(INITARGS);
#endif #endif
#ifdef XPRINT #ifdef XPRINT
extern void XpExtensionInit(INITARGS); extern void XpExtensionInit(INITARGS);
@ -606,7 +606,7 @@ InitExtensions(argc, argv)
if (!noSecurityExtension) SecurityExtensionInit(); if (!noSecurityExtension) SecurityExtensionInit();
#endif #endif
#ifdef XSELINUX #ifdef XSELINUX
XSELinuxExtensionInit(); SELinuxExtensionInit();
#endif #endif
#ifdef XPRINT #ifdef XPRINT
XpExtensionInit(); /* server-specific extension, cannot be disabled */ XpExtensionInit(); /* server-specific extension, cannot be disabled */
@ -703,7 +703,7 @@ static ExtensionModule staticExtensions[] = {
{ SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL }, { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
#endif #endif
#ifdef XSELINUX #ifdef XSELINUX
{ XSELinuxExtensionInit, XSELINUX_EXTENSION_NAME, NULL, NULL, NULL }, { SELinuxExtensionInit, SELINUX_EXTENSION_NAME, NULL, NULL, NULL },
#endif #endif
#ifdef XPRINT #ifdef XPRINT
{ XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL }, { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },