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

Commit 294ba380 authored by Arve Hjønnevåg's avatar Arve Hjønnevåg
Browse files

trusty: rpmb_dev: Use socket from init and update init script 

Stop creating a socket on a persistent filesystem and use a socket
created by init in /dev/socket/ instead.

Many init script changes to make rpmb_dev.rc usable on cuttlefish.

Test: Build and run aosp_cf_x86_64_phone_trusty_vm-trunk_staging-userdebug
Bug: 309007107
Change-Id: Idc830211b3298d25bbb310dcb7489dd89fe5afc6
parent da9ec0cd

trusty/utils/rpmb_dev/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ cc_binary { 
    ],

    shared_libs: [

        "libc",

        "libcutils",

        "liblog",

        "libcrypto",

    ],

trusty/utils/rpmb_dev/rpmb_dev.c

+16 −11
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "rpmb_protocol.h"



#include <assert.h>

#include <cutils/sockets.h>

#include <errno.h>

#include <fcntl.h>

#include <getopt.h>
@@ -613,6 +614,9 @@ int main(int argc, char** argv) { 
        return EXIT_FAILURE;

    }



    cmdres_sock = android_get_control_socket(socket_path);

    if (cmdres_sock < 0) {

        ALOGW("android_get_control_socket(%s) failed, fall back to create it\n", socket_path);

        cmdres_sock = socket(AF_UNIX, SOCK_STREAM, 0);

        if (cmdres_sock < 0) {

            ALOGE("rpmb_dev: Failed to create command/response socket: %s\n", strerror(errno));
@@ -628,6 +632,7 @@ int main(int argc, char** argv) { 
                  strerror(errno));

            return EXIT_FAILURE;

        }

    }



    ret = listen(cmdres_sock, 1);

    if (ret < 0) {

trusty/utils/rpmb_dev/rpmb_dev.rc

+19 −14
Original line number Diff line number Diff line 
# RPMB Mock

on post-fs-data

    mkdir /data/vendor/ss

    chown root system /data/vendor/ss

    chmod 0770 /data/vendor/ss

    rm /data/vendor/ss/rpmb_sock

    start rpmb_mock_init

on post-fs

    mkdir /mnt/vendor/persist/ss 0770 root system

    exec_start rpmb_mock_init

    start rpmb_mock



on post-fs-data

    mkdir /data/vendor/ss 0770 root system

    symlink /mnt/vendor/persist/ss /data/vendor/ss/persist

    chown root system /data/vendor/ss/persist

    chmod 0770 /data/vendor/ss/persist



    # Storage proxy

    start storageproxyd

    restart storageproxyd



service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 \

        -r /data/vendor/ss/rpmb_sock -p /data/vendor/ss -t sock

    class main

    disabled

    user root

service storageproxyd /vendor/bin/storageproxyd -d ${ro.hardware.trusty_ipc_dev:-/dev/trusty-ipc-dev0} \

        -r /dev/socket/rpmb_mock -p /data/vendor/ss -t sock

    class early_hal

    user system

    group system



service rpmb_mock_init /vendor/bin/rpmb_dev --dev /data/vendor/ss/RPMB_DATA --init --size 2048

service rpmb_mock_init /vendor/bin/rpmb_dev --dev /mnt/vendor/persist/ss/RPMB_DATA --init --size 2048

    disabled

    user system

    group system

    oneshot



service rpmb_mock /vendor/bin/rpmb_dev --dev /data/vendor/ss/RPMB_DATA --sock /data/vendor/ss/rpmb_sock

service rpmb_mock /vendor/bin/rpmb_dev --dev /mnt/vendor/persist/ss/RPMB_DATA \

                          --sock rpmb_mock

    class main

    disabled

    user system

    group system

    socket rpmb_mock stream 660 system system