diff options
| author | Nick Kralevich <nnk@google.com> | 2018-11-05 06:41:36 -0800 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2018-11-05 06:41:36 -0800 |
| commit | 1ad3304eae5e562aba64f256e5589d144d9cfadd (patch) | |
| tree | 238c46a221023c405535b378626c671384d7405c /libselinux/src/label_file.c | |
| parent | 10c0b0bcb9a95b20939a1dbc785e4e3346e715f4 (diff) | |
| parent | 3f99b14939ec616ef59f62887e2532cd89409a3e (diff) | |
| download | android_external_selinux-1ad3304eae5e562aba64f256e5589d144d9cfadd.tar.gz android_external_selinux-1ad3304eae5e562aba64f256e5589d144d9cfadd.tar.bz2 android_external_selinux-1ad3304eae5e562aba64f256e5589d144d9cfadd.zip | |
Merge remote-tracking branch 'aosp/upstream-master' into mymerge
In particular, pulls in
https://github.com/SELinuxProject/selinux/commit/3f99b14939ec616ef59f62887e2532cd89409a3e
which is needed for b/118685852
Followed the following steps:
# In repo client
cd external/selinux
repo sync .
repo start mymerge .
git merge aosp/upstream-master --no-ff # resolve any conflicts
repo upload .
Bug: 118685852
Test: Android compiles and no obvious problems.
Change-Id: Ic8f1bb2b573a1491b733732653afd7dbe494c85f
Diffstat (limited to 'libselinux/src/label_file.c')
| -rw-r--r-- | libselinux/src/label_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libselinux/src/label_file.c b/libselinux/src/label_file.c index 3a9fb3b1..c3a903c8 100644 --- a/libselinux/src/label_file.c +++ b/libselinux/src/label_file.c @@ -232,7 +232,7 @@ end_arch_check: /* allocate the stems_data array */ rc = next_entry(&stem_map_len, mmap_area, sizeof(uint32_t)); - if (rc < 0 || !stem_map_len) + if (rc < 0) return -1; /* |