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

Commit 6a9c4e79 authored by Janis Danisevskis's avatar Janis Danisevskis
Browse files

Fix a memory leak in gatekeeper. 

In violation to the documentation of GateKeeper::GetAuthTokenKey and
GateKeeper::GetPasswordKey, the implementations in SoftGateKeeper
allocate and return buffers and relinquish ownership causing a memory
leak, because the caller expects the implementation to retain ownership.

Bug: 129768470
Bug: 134557251
Test: gatekeeper-unit-tests
Change-Id: I0af9539d3dcd47dfd1e7d80cdee700ea0c2d6d0f
Merged-In: I0af9539d3dcd47dfd1e7d80cdee700ea0c2d6d0f
parent 35629db6

gatekeeperd/SoftGateKeeper.h

+4 −11
Original line number Diff line number Diff line
@@ -58,23 +58,16 @@ public: 
    virtual ~SoftGateKeeper() {

    }



    virtual bool GetAuthTokenKey(const uint8_t **auth_token_key,

            uint32_t *length) const {

    virtual bool GetAuthTokenKey(const uint8_t** auth_token_key, uint32_t* length) const {

        if (auth_token_key == NULL || length == NULL) return false;

        uint8_t *auth_token_key_copy = new uint8_t[SIGNATURE_LENGTH_BYTES];

        memcpy(auth_token_key_copy, key_.get(), SIGNATURE_LENGTH_BYTES);



        *auth_token_key = auth_token_key_copy;

        *auth_token_key = key_.get();

        *length = SIGNATURE_LENGTH_BYTES;

        return true;

    }



    virtual void GetPasswordKey(const uint8_t** password_key, uint32_t* length) {

        if (password_key == NULL || length == NULL) return;

        uint8_t *password_key_copy = new uint8_t[SIGNATURE_LENGTH_BYTES];

        memcpy(password_key_copy, key_.get(), SIGNATURE_LENGTH_BYTES);



        *password_key = password_key_copy;

        *password_key = key_.get();

        *length = SIGNATURE_LENGTH_BYTES;

    }