| commit | 8124ee9930687fcdd8ed7b7cbe0a88cb113fd404 | [log] [tgz] |
|---|---|---|
| author | Wenhao Wang <wenhaowang@google.com> | Sat Jun 13 01:57:12 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jun 13 01:57:12 2020 +0000 |
| tree | ac7f40403e75c28cdf94eed2cee3acea5c262c3b | |
| parent | 3423d5edc7c7d70d598f911a081909f25d096ee9 [diff] | |
| parent | f20e589c00b328fcf645c2a36288ebbd6d1dbc36 [diff] |
Merge "trusty:storageproxyd: Fix in_cdb.length setting on send_ufs_rpmb_req" am: 55e8954950 am: f20e589c00 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1334266 Change-Id: I1e3b4fe083d2670b1f31f331e540ee61cd64f2a1
diff --git a/trusty/storage/proxy/rpmb.c b/trusty/storage/proxy/rpmb.c index 7dfd0d0..d1ed649 100644 --- a/trusty/storage/proxy/rpmb.c +++ b/trusty/storage/proxy/rpmb.c
@@ -231,7 +231,7 @@ if (req->read_size) { /* Prepare SECURITY PROTOCOL IN command. */ - out_cdb.length = __builtin_bswap32(req->read_size); + in_cdb.length = __builtin_bswap32(req->read_size); sg_io_hdr_t io_hdr; set_sg_io_hdr(&io_hdr, SG_DXFER_FROM_DEV, sizeof(in_cdb), sizeof(sense_buffer), req->read_size, read_buf, (unsigned char*)&in_cdb, sense_buffer);