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

Commit 1643ba1d authored by dcashman's avatar dcashman Committed by android-build-merger
Browse files

Merge "svcmgr: don\'t send reply to one-way txn." into nyc-dev 

am: c1810b5d

* commit 'c1810b5d':
  svcmgr: don't send reply to one-way txn.
parents 0bf6d06f c1810b5d

cmds/servicemanager/binder.c

+15 −6
Original line number Diff line number Diff line
@@ -167,20 +167,27 @@ int binder_write(struct binder_state *bs, void *data, size_t len) 
    return res;

}



void binder_free_buffer(struct binder_state *bs,

                        binder_uintptr_t buffer_to_free)

{

    struct {

        uint32_t cmd_free;

        binder_uintptr_t buffer;

    } __attribute__((packed)) data;

    data.cmd_free = BC_FREE_BUFFER;

    data.buffer = buffer_to_free;

    binder_write(bs, &data, sizeof(data));

}



void binder_send_reply(struct binder_state *bs,

                       struct binder_io *reply,

                       binder_uintptr_t buffer_to_free,

                       int status)

{

    struct {

        uint32_t cmd_free;

        binder_uintptr_t buffer;

        uint32_t cmd_reply;

        struct binder_transaction_data txn;

    } __attribute__((packed)) data;



    data.cmd_free = BC_FREE_BUFFER;

    data.buffer = buffer_to_free;

    data.cmd_reply = BC_REPLY;

    data.txn.target.ptr = 0;

    data.txn.cookie = 0;
@@ -243,7 +250,9 @@ int binder_parse(struct binder_state *bs, struct binder_io *bio, 
                bio_init(&reply, rdata, sizeof(rdata), 4);

                bio_init_from_txn(&msg, txn);

                res = func(bs, txn, &msg, &reply);

                binder_send_reply(bs, &reply, txn->data.ptr.buffer, res);

                binder_free_buffer(bs, txn->data.ptr.buffer);

                if ((txn->flags & TF_ONE_WAY) == 0)

                    binder_send_reply(bs, &reply, res);

            }

            ptr += sizeof(*txn);

            break;