diff options
author | Stephen Smalley <sds@tycho.nsa.gov> | 2013-07-29 12:13:34 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-29 12:13:34 -0700 |
commit | 1e2cf2c4a2d15a9b1ca2d353b99fb6884413ffe1 (patch) | |
tree | 057f71c2e020fd725bb3feed3d22626c044878ea | |
parent | f200031819088885401110c68543b887df7325bf (diff) | |
parent | cb92504c2b9439b2c9bb745a3727f58e8c44c224 (diff) | |
download | libselinux-kitkat-mr1.1-release.tar.gz |
am cb92504c: Fix logging of sepolicy pathname on policy load.android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-cts-releasekitkat-cts-dev
* commit 'cb92504c2b9439b2c9bb745a3727f58e8c44c224':
Fix logging of sepolicy pathname on policy load.
-rw-r--r-- | src/android.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/android.c b/src/android.c index 578fa9e..638c0a8 100644 --- a/src/android.c +++ b/src/android.c @@ -847,14 +847,14 @@ int selinux_android_reload_policy(void) } if (fstat(fd, &sb) < 0) { selinux_log(SELINUX_ERROR, "SELinux: Could not stat %s: %s\n", - sepolicy_file[i], strerror(errno)); + sepolicy_file[i-1], strerror(errno)); close(fd); return -1; } map = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0); if (map == MAP_FAILED) { selinux_log(SELINUX_ERROR, "SELinux: Could not map %s: %s\n", - sepolicy_file[i], strerror(errno)); + sepolicy_file[i-1], strerror(errno)); close(fd); return -1; } @@ -870,7 +870,7 @@ int selinux_android_reload_policy(void) munmap(map, sb.st_size); close(fd); - selinux_log(SELINUX_INFO, "SELinux: Loaded policy from %s\n", sepolicy_file[i]); + selinux_log(SELINUX_INFO, "SELinux: Loaded policy from %s\n", sepolicy_file[i-1]); return 0; } |