aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-02-08 16:51:57 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-02-08 16:51:57 +0000
commit470a196b685ead0919e4beec675ab7ca902ea2a1 (patch)
tree2ef35f99409eb08bc6cc14acd2ab436a02eb80ec
parent05085b8624bb787f8ceb7029093af558e079d84b (diff)
parent6d35bdeedae09728adc6a2479fdece7f4b4878dd (diff)
downloadselinux-android12-mainline-mediaprovider-release.tar.gz
Snap for 8160102 from 6d35bdeedae09728adc6a2479fdece7f4b4878dd to mainline-mediaprovider-releaseandroid-mainline-12.0.0_r90android-mainline-12.0.0_r121android-mainline-12.0.0_r106aml_mpr_311911090android12-mainline-mediaprovider-release
Change-Id: I8e10fe983a4fc1b906174bb969cfdf2e15f16677
-rw-r--r--libselinux/src/label_backends_android.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libselinux/src/label_backends_android.c b/libselinux/src/label_backends_android.c
index d81faabe..121b52f5 100644
--- a/libselinux/src/label_backends_android.c
+++ b/libselinux/src/label_backends_android.c
@@ -278,6 +278,12 @@ static void closef(struct selabel_handle *rec)
struct spec *spec;
unsigned int i;
+ if (!data)
+ return;
+
+ /* make sure successive ->func_close() calls are harmless */
+ rec->data = NULL;
+
if (data->spec_arr) {
for (i = 0; i < data->nspec; i++) {
spec = &data->spec_arr[i];