Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3f8d033 authored by Robert Craig's avatar Robert Craig
Browse files

Add seinfo parsing to PackageManagerService. 



This patch set allows the PMS to parse the
mac_permissions.xml file which contains the
seinfo values. Each package that is installed
on the device will be assigned an seinfo value
based on policy. This seinfo value will help label
the app process and data directory.  Modifications
include adjustments to ApplicationInfo.java
to store the seinfo tag per package as well as
adjustments to installd to communicate the seinfo
tag to libselinux.

Change-Id: I61ad1ea12fb6a9a6d0b108ec163bc4bf4c954b58
Signed-off-by: default avatarrpcraig <rpcraig@tycho.ncsc.mil>
parent f6c4dba2

cmds/installd/commands.c

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ dir_rec_t android_app_lib_dir; 
dir_rec_t android_media_dir;

dir_rec_array_t android_system_dirs;



int install(const char *pkgname, uid_t uid, gid_t gid)

int install(const char *pkgname, uid_t uid, gid_t gid, const char *seinfo)

{

    char pkgdir[PKG_PATH_MAX];

    char libsymlink[PKG_PATH_MAX];
@@ -91,7 +91,7 @@ int install(const char *pkgname, uid_t uid, gid_t gid) 
        return -1;

    }



    if (selinux_android_setfilecon(pkgdir, pkgname, uid) < 0) {

    if (selinux_android_setfilecon2(pkgdir, pkgname, seinfo, uid) < 0) {

        ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno));

        unlink(libsymlink);

        unlink(pkgdir);

cmds/installd/installd.c

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static int do_ping(char **arg, char reply[REPLY_MAX]) 


static int do_install(char **arg, char reply[REPLY_MAX])

{

    return install(arg[0], atoi(arg[1]), atoi(arg[2])); /* pkgname, uid, gid */

    return install(arg[0], atoi(arg[1]), atoi(arg[2]), arg[3]); /* pkgname, uid, gid, seinfo */

}



static int do_dexopt(char **arg, char reply[REPLY_MAX])
@@ -134,7 +134,7 @@ struct cmdinfo { 


struct cmdinfo cmds[] = {

    { "ping",                 0, do_ping },

    { "install",              3, do_install },

    { "install",              4, do_install },

    { "dexopt",               3, do_dexopt },

    { "movedex",              2, do_move_dex },

    { "rmdex",                1, do_rm_dex },

cmds/installd/installd.h

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ int ensure_media_user_dirs(userid_t userid); 


/* commands.c */



int install(const char *pkgname, uid_t uid, gid_t gid);

int install(const char *pkgname, uid_t uid, gid_t gid, const char *seinfo);

int uninstall(const char *pkgname, uid_t persona);

int renamepkg(const char *oldpkgname, const char *newpkgname);

int fix_uid(const char *pkgname, uid_t uid, gid_t gid);

core/java/android/content/pm/ApplicationInfo.java

+15 −0
Original line number Diff line number Diff line
@@ -397,6 +397,15 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     */

    public String[] resourceDirs;



    /**

     * String retrieved from the seinfo tag found in selinux policy. This value

     * is useful in setting an SELinux security context on the process as well

     * as its data directory.

     *

     * {@hide}

     */

    public String seinfo;



    /**

     * Paths to all shared libraries this application is linked against.  This

     * field is only set if the {@link PackageManager#GET_SHARED_LIBRARY_FILES
@@ -477,6 +486,9 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        if (resourceDirs != null) {

            pw.println(prefix + "resourceDirs=" + resourceDirs);

        }

        if (seinfo != null) {

            pw.println(prefix + "seinfo=" + seinfo);

        }

        pw.println(prefix + "dataDir=" + dataDir);

        if (sharedLibraryFiles != null) {

            pw.println(prefix + "sharedLibraryFiles=" + sharedLibraryFiles);
@@ -544,6 +556,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        publicSourceDir = orig.publicSourceDir;

        nativeLibraryDir = orig.nativeLibraryDir;

        resourceDirs = orig.resourceDirs;

        seinfo = orig.seinfo;

        sharedLibraryFiles = orig.sharedLibraryFiles;

        dataDir = orig.dataDir;

        uid = orig.uid;
@@ -583,6 +596,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        dest.writeString(publicSourceDir);

        dest.writeString(nativeLibraryDir);

        dest.writeStringArray(resourceDirs);

        dest.writeString(seinfo);

        dest.writeStringArray(sharedLibraryFiles);

        dest.writeString(dataDir);

        dest.writeInt(uid);
@@ -621,6 +635,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        publicSourceDir = source.readString();

        nativeLibraryDir = source.readString();

        resourceDirs = source.readStringArray();

        seinfo = source.readString();

        sharedLibraryFiles = source.readStringArray();

        dataDir = source.readString();

        uid = source.readInt();

services/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -2171,7 +2171,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
            // the PID of the new process, or else throw a RuntimeException.

            Process.ProcessStartResult startResult = Process.start("android.app.ActivityThread",

                    app.processName, uid, uid, gids, debugFlags, mountExternal,

                    app.info.targetSdkVersion, null, null);

                    app.info.targetSdkVersion, app.info.seinfo, null);















            BatteryStatsImpl bs = app.batteryStats.getBatteryStats();















            synchronized (bs) {