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

Commit 4fb37124 authored by Christopher Ferris's avatar Christopher Ferris
Browse files

Modify the mmc data structure. 

The new 6.0 kernel headers changed all variable length
structures from [0] to []. This causes a clang warning to
trigger, so rewrite the mmc data structures using a union
to avoid having a variable sized array in the middle of the
structure.

Test: Builds.
Change-Id: Ib1ac92c4f76af386d934f51a3c73cb8914e97624
parent 27cf51e7

trusty/storage/proxy/rpmb.c

+2 −2
Original line number Diff line number Diff line
@@ -322,9 +322,9 @@ static enum scsi_result check_sg_io_hdr(const sg_io_hdr_t* io_hdrp) { 
}



static int send_mmc_rpmb_req(int mmc_fd, const struct storage_rpmb_send_req* req) {

    struct {

    union {

        struct mmc_ioc_multi_cmd multi;

        struct mmc_ioc_cmd cmd_buf[3];

        uint8_t raw[sizeof(struct mmc_ioc_multi_cmd) + sizeof(struct mmc_ioc_cmd) * 3];

    } mmc = {};

    struct mmc_ioc_cmd* cmd = mmc.multi.cmds;

    int rc;