psmattas/android_system_qcom-lineage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bfad727b06 on remote branch

Browse Source 
Change-Id: I5941c38f9dec29f3ac8c1f3b1b56da87e5134d22
This commit is contained in:
Linux Build Service Account
2018-06-25 03:04:11 -07:00
parent 532be76674 bfad727b06
commit babf4a5e8c
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
softap/sdk/qsap.c
View File

@@ -603,6 +603,8 @@ int wigig_ensure_entropy_file_exists()
{ {
int ret; int ret;
int destfd; int destfd;
struct passwd *pw;
struct group *gr;
ret = access(WIGIG_ENTROPY_FILE, R_OK|W_OK); ret = access(WIGIG_ENTROPY_FILE, R_OK|W_OK);
if ((ret == 0) || (errno == EACCES)) { if ((ret == 0) || (errno == EACCES)) {
@@ -634,9 +636,17 @@ int wigig_ensure_entropy_file_exists()
return -1; return -1;
} }
if (chown(WIGIG_ENTROPY_FILE, getpwnam("system")->pw_uid, getgrnam("wifi")->gr_gid) < 0) { pw = getpwnam("system");
ALOGE("Error changing group ownership of %s to %d: %s", gr = getgrnam("wifi");
WIGIG_ENTROPY_FILE, getgrnam("wifi")->gr_gid, strerror(errno)); if (pw && gr) {
if (chown(WIGIG_ENTROPY_FILE, pw->pw_uid, gr->gr_gid) < 0) {
ALOGE("Error changing group ownership of %s to %d: %s",
WIGIG_ENTROPY_FILE, gr->gr_gid, strerror(errno));
unlink(WIGIG_ENTROPY_FILE);
return -1;
}
} else {
ALOGE("Cannot get pw_uid or gr_gid : %s", strerror(errno));
unlink(WIGIG_ENTROPY_FILE); unlink(WIGIG_ENTROPY_FILE);
return -1; return -1;
} }