tequilaOS/platform_external_selinux
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build for android_platform.c am: 4a15e5176d am: e39a9af2db

Browse source 
Original change: https://android-review.googlesource.com/c/platform/external/selinux/+/2254488

Change-Id: Idd1fadc274f851eb736b4daf66b307a6f37bf859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Thiébaud Weksteen 2022-10-19 07:47:53 +00:00 committed by Automerger Merge Worker
commit 52aebc0e15
4 changed files with 38 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libselinux/Android.bp
View file

@ -109,7 +109,8 @@ cc_defaults {
},
android: {
srcs: [
"src/android/android_platform.c",
"src/android/android_device.c",
"src/android/android_seapp.c",
],
static: {
whole_static_libs: [

1
libselinux/src/android/android_device.c
View file

@ -6,7 +6,6 @@
#include <libgen.h>
#include <limits.h>
#include <linux/magic.h>
#include <pwd.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>

34
libselinux/src/android/android_internal.h
View file

@ -1,7 +1,9 @@
#pragma once
#include <stdbool.h>
#include <sys/types.h>
#include <selinux/context.h>
#include <selinux/selinux.h>
#ifdef __cplusplus
@ -44,6 +46,38 @@ struct selabel_handle* context_handle(
const path_alts_t *context_paths,
const char* name);
/* The kind of request when looking up an seapp_context. */
enum seapp_kind {
/* Returns the SELinux type for the app data directory */
SEAPP_TYPE,
/* Returns the SELinux type for the app process */
SEAPP_DOMAIN
};
/* Search an app (or its data) based on its name and information within the list
* of known seapp_contexts. If found, sets the type and categories of ctx and
* returns 0. Returns -1 in case of error; -2 for out of memory */
int seapp_context_lookup(enum seapp_kind kind,
uid_t uid,
bool isSystemServer,
const char *seinfo,
const char *pkgname,
context_t ctx);
/* Which categories should be associated to the process */
enum levelFrom {
/* None */
LEVELFROM_NONE,
/* The categories of the application */
LEVELFROM_APP,
/* The categories of the end-user */
LEVELFROM_USER,
/* Application and end-user */
LEVELFROM_ALL
};
/* Sets the categories of ctx based on the level request */
int set_range_from_level(context_t ctx, enum levelFrom levelFrom, uid_t userid, uid_t appid);
#ifdef __cplusplus
}

42
libselinux/src/android/android_seapp.c
View file

@ -1,9 +1,4 @@
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <fnmatch.h>
#include <fts.h>
#include <libgen.h>
#include <limits.h>
#include <linux/magic.h>
#include <pwd.h>
@ -11,25 +6,15 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/vfs.h>
#include <sys/xattr.h>
#include <unistd.h>
#include <log/log.h>
#include <packagelistparser/packagelistparser.h>
#include <private/android_filesystem_config.h>
#include <selinux/android.h>
#include <selinux/context.h>
#include <selinux/selinux.h>
#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
#include <sys/_system_properties.h>
#include "android_internal.h"
#include "callbacks.h"
#include "label_internal.h"
#include "selinux_internal.h"
/* Locations for the file_contexts files. For each partition, only the first
@ -112,18 +97,6 @@ struct selabel_handle* selinux_android_file_context_handle(void)
return initialize_backend(SELABEL_CTX_FILE, "file", opts, nopts);
}
/* Which categories should be associated to the process */
enum levelFrom {
/* None */
LEVELFROM_NONE,
/* The categories of the application */
LEVELFROM_APP,
/* The categories of the end-user */
LEVELFROM_USER,
/* Application and end-user */
LEVELFROM_ALL
};
#if DEBUG
static char const * const levelFromName[] = {
"none",
@ -636,14 +609,6 @@ void selinux_android_seapp_context_init(void) {
*/
#define CAT_MAPPING_MAX_ID (0x1<<16)
/* The kind of request when looking up an seapp_context. */
enum seapp_kind {
/* Returns the SELinux type for the app data directory */
SEAPP_TYPE,
/* Returns the SELinux type for the app process */
SEAPP_DOMAIN
};
#define PRIVILEGED_APP_STR ":privapp"
#define EPHEMERAL_APP_STR ":ephemeralapp"
#define TARGETSDKVERSION_STR ":targetSdkVersion="
@ -688,7 +653,7 @@ static int seinfo_parse(char *dest, const char *src, size_t size)
}
/* Sets the categories of ctx based on the level request */
static int set_range_from_level(context_t ctx, enum levelFrom levelFrom, uid_t userid, uid_t appid)
int set_range_from_level(context_t ctx, enum levelFrom levelFrom, uid_t userid, uid_t appid)
{
char level[255];
switch (levelFrom) {
@ -721,10 +686,7 @@ static int set_range_from_level(context_t ctx, enum levelFrom levelFrom, uid_t u
return 0;
}
/* Search an app (or its data) based on its name and information within the list
* of known seapp_contexts. If found, sets the type and categories of ctx and
* returns 0. Returns -1 in case of error; -2 for out of memory */
static int seapp_context_lookup(enum seapp_kind kind,
int seapp_context_lookup(enum seapp_kind kind,
uid_t uid,
bool isSystemServer,
const char *seinfo,