ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "trusty: storageproxyd: Fix rebase of UFS support"

Browse source
This commit is contained in:
Matthew Maurer 2019-12-27 00:39:32 +00:00 • committed by Gerrit Code Review
commit 369dff24da
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
trusty/storage/proxy/rpmb.c
View file

@ -361,6 +361,15 @@ int rpmb_open(const char* rpmb_devname, enum dev_type open_dev_type) {
return rc; return rc;
} }
rpmb_fd = rc; rpmb_fd = rc;
/* For UFS, it is prudent to check we have a sg device by calling an ioctl */
if (dev_type == UFS_RPMB) {
if ((ioctl(rpmb_fd, SG_GET_VERSION_NUM, &sg_version_num) < 0) ||
(sg_version_num < RPMB_MIN_SG_VERSION_NUM)) {
ALOGE("%s is not a sg device, or old sg driver\n", rpmb_devname);
return -1;
}
}
} else { } else {
struct sockaddr_un unaddr; struct sockaddr_un unaddr;
struct sockaddr *addr = (struct sockaddr *)&unaddr; struct sockaddr *addr = (struct sockaddr *)&unaddr;
@ -382,15 +391,6 @@ int rpmb_open(const char* rpmb_devname, enum dev_type open_dev_type) {
} }
} }
/* For UFS, it is prudent to check we hava a sg device by calling an ioctl */
if (dev_type == UFS_RPMB) {
if ((ioctl(rc, SG_GET_VERSION_NUM, &sg_version_num) < 0) ||
(sg_version_num < RPMB_MIN_SG_VERSION_NUM)) {
ALOGE("%s is not a sg device, or old sg driver\n", rpmb_devname);
return -1;
}
}
rpmb_fd = rc;
return 0; return 0;
} }