diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-17 03:09:44 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-17 03:09:44 +0000 |
| commit | 8eaf10fe74c623848d74df00c985ff305b804854 (patch) | |
| tree | 0ed878b2f74d44238e3a535860fc400d89d7e571 | |
| parent | 6d630852f52832888d4cac714d60062809726bee (diff) | |
| parent | c66e99bf24bf07fdc3a601424512d332cc206f80 (diff) | |
| download | core-8eaf10fe74c623848d74df00c985ff305b804854.tar.gz | |
Snap for 7557983 from c66e99bf24bf07fdc3a601424512d332cc206f80 to sc-release
Change-Id: I26a5056e7d5011c0001c474e0310dca95d243b1c
| -rw-r--r-- | trusty/storage/proxy/rpmb.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/trusty/storage/proxy/rpmb.c b/trusty/storage/proxy/rpmb.c index d1ed6493f..abeacdfed 100644 --- a/trusty/storage/proxy/rpmb.c +++ b/trusty/storage/proxy/rpmb.c @@ -212,6 +212,7 @@ static int send_ufs_rpmb_req(int sg_fd, const struct storage_rpmb_send_req* req) rc = ioctl(sg_fd, SG_IO, &io_hdr); if (rc < 0) { ALOGE("%s: ufs ioctl failed: %d, %s\n", __func__, rc, strerror(errno)); + goto err_op; } write_buf += req->reliable_write_size; } @@ -225,6 +226,7 @@ static int send_ufs_rpmb_req(int sg_fd, const struct storage_rpmb_send_req* req) rc = ioctl(sg_fd, SG_IO, &io_hdr); if (rc < 0) { ALOGE("%s: ufs ioctl failed: %d, %s\n", __func__, rc, strerror(errno)); + goto err_op; } write_buf += req->write_size; } @@ -240,6 +242,8 @@ static int send_ufs_rpmb_req(int sg_fd, const struct storage_rpmb_send_req* req) ALOGE("%s: ufs ioctl failed: %d, %s\n", __func__, rc, strerror(errno)); } } + +err_op: return rc; } |