commit 5ed1bda720be36f363f7e475c7e5615caa05d4f5
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 03 09:03:14 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 03 09:03:14 2022 +0000
tree 211ae1848e0d8f39598b23977bc40224827663d4
parent 9d8576d7013e4179453aaafd0eade26d97e4b553
parent 7e357eb73177d08de45d815635a854ad93e2484d

Merge "Make bpf_attach_tracepoint() available as soon as possible"

trusty/storage/proxy/rpmb.c

diff --git a/trusty/storage/proxy/rpmb.c b/trusty/storage/proxy/rpmb.c
index f059935..b1b8232 100644
--- a/trusty/storage/proxy/rpmb.c
+++ b/trusty/storage/proxy/rpmb.c
@@ -322,9 +322,9 @@
 }
 
 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;