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

Commit 250bcbb5 authored by chaviw's avatar chaviw
Browse files

Store Layer ownerUid based on metadata or callingUid. 

In most cases we want the Layer ownerUid to be the same as the
callingUid since the caller requesting to create the layer should be the
owner. However, in cases when the requst to create the layer comes from
a system process, we should attempt to use the UID passed into the
metadata. This is because the system process could request to create a
layer on behalf of another process.

Test: adb shell dumpsys SurfaceFlinger shows correct uid
Bug: 155825630
Change-Id: I633f293e087cdf413f7cb5e296bd923d83da841c
parent 63dd5e25

services/surfaceflinger/Layer.cpp

+13 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <gui/LayerDebugInfo.h>

#include <gui/Surface.h>

#include <math.h>

#include <private/android_filesystem_config.h>

#include <renderengine/RenderEngine.h>

#include <stdint.h>

#include <stdlib.h>
@@ -139,6 +140,14 @@ Layer::Layer(const LayerCreationArgs& args) 


    mCallingPid = args.callingPid;

    mCallingUid = args.callingUid;



    if (mCallingUid == AID_GRAPHICS || mCallingUid == AID_SYSTEM) {

        // If the system didn't send an ownerUid, use the callingUid for the ownerUid.

        mOwnerUid = args.metadata.getInt32(METADATA_OWNER_UID, mCallingUid);

    } else {

        // A create layer request from a non system request cannot specify the owner uid

        mOwnerUid = mCallingUid;

    }

}



void Layer::onFirstRef() {
@@ -1669,8 +1678,8 @@ void Layer::dumpFrameEvents(std::string& result) { 
}



void Layer::dumpCallingUidPid(std::string& result) const {

    StringAppendF(&result, "Layer %s (%s) pid:%d uid:%d\n", getName().c_str(), getType(),

                  mCallingPid, mCallingUid);

    StringAppendF(&result, "Layer %s (%s) callingPid:%d callingUid:%d ownerUid:%d\n",

                  getName().c_str(), getType(), mCallingPid, mCallingUid, mOwnerUid);

}



void Layer::onDisconnect() {
@@ -2343,6 +2352,8 @@ void Layer::writeToProtoCommonState(LayerProto* layerInfo, LayerVector::StateSet 
        }



        layerInfo->set_is_relative_of(state.isRelativeOf);



        layerInfo->set_owner_uid(mOwnerUid);

    }



    if (traceFlags & SurfaceTracing::TRACE_INPUT) {

services/surfaceflinger/Layer.h

+6 −0
Original line number Diff line number Diff line
@@ -967,6 +967,8 @@ public: 
     */

    virtual bool needsInputInfo() const { return hasInputInfo(); }



    uid_t getOwnerUid() { return mOwnerUid; }



protected:

    compositionengine::OutputLayer* findOutputLayerForDisplay(const DisplayDevice*) const;
@@ -1089,6 +1091,10 @@ private: 
    pid_t mCallingPid;

    uid_t mCallingUid;



    // The owner of the layer. If created from a non system process, it will be the calling uid.

    // If created from a system process, the value can be passed in.

    uid_t mOwnerUid;



    // The current layer is a clone of mClonedFrom. This means that this layer will update it's

    // properties based on mClonedFrom. When mClonedFrom latches a new buffer for BufferLayers,

    // this layer will update it's buffer. When mClonedFrom updates it's drawing state, children,

services/surfaceflinger/layerproto/LayerProtoParser.cpp

+2 −1
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ LayerProtoParser::Layer LayerProtoParser::generateLayer(const LayerProto& layerP 
    }

    layer.cornerRadiusCrop = generateFloatRect(layerProto.corner_radius_crop());

    layer.shadowRadius = layerProto.shadow_radius();

    layer.ownerUid = layerProto.owner_uid();

    return layer;

}
@@ -276,7 +277,7 @@ std::string LayerProtoParser::Region::to_string(const char* what) const { 


std::string LayerProtoParser::Layer::to_string() const {

    std::string result;

    StringAppendF(&result, "+ %s (%s)\n", type.c_str(), name.c_str());

    StringAppendF(&result, "+ %s (%s) uid=%d\n", type.c_str(), name.c_str(), ownerUid);

    result.append(transparentRegion.to_string("TransparentRegion").c_str());

    result.append(visibleRegion.to_string("VisibleRegion").c_str());

    result.append(damageRegion.to_string("SurfaceDamageRegion").c_str());

services/surfaceflinger/layerproto/include/layerproto/LayerProtoParser.h

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ public: 
        LayerMetadata metadata;

        LayerProtoParser::FloatRect cornerRadiusCrop;

        float shadowRadius;

        uid_t ownerUid;



        std::string to_string() const;

    };

services/surfaceflinger/layerproto/layers.proto

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ message LayerProto { 
  bool is_relative_of = 51;

  // Layer's background blur radius in pixels.

  int32 background_blur_radius = 52;



  uint32 owner_uid = 53;

}



message PositionProto {