libsepol: fix reallocarray imports
PATCH 1/1 libsepol: fix reallocarray imports
In f0a5f6e, calls to reallocarray were introduced. Ensure that the correct header (private.h) is included when necessary.
Fixes f0a5f6e ("libsepol: use reallocarray wrapper to avoid overflows")
Test: Built using Android CI (glibc 2.17)
Signed-off-by Thiébaud Weksteen <[email protected]>
--- libsepol/src/kernel_to_common.c | 1 + libsepol/src/util.c | 2 ++ 2 files changed, 3 insertions(+)
libsepol/src/kernel_to_common.c +1 -0
@@ -18,6 +18,7 @@#include <sepol/policydb/hashtab.h> #include <sepol/policydb/symtab.h> +#include "private.h" #include "kernel_to_common.h"
libsepol/src/util.c +2 -0
@@ -28,6 +28,8 @@#include <sepol/policydb/policydb.h> #include <sepol/policydb/util.h> +#include "private.h" +struct val_to_name {unsigned int val;char *name;
Signature · 1 line
2.35.1.574.g5d30c73bfb-goog
Quoted 7 lines · Thiébaud Weksteen
In f0a5f6e, calls to reallocarray were introduced. Ensure that the correct header (
private.h) is included when necessary.Fixes f0a5f6e ("libsepol: use reallocarray wrapper to avoid overflows")Test: Built using Android CI (glibc 2.17)
Signed-off-by Thiébaud Weksteen <[email protected]>
Acked-by James Carter <[email protected]>
Quoted 33 lines
--- libsepol/src/kernel_to_common.c | 1 + libsepol/src/util.c | 2 ++ 2 files changed, 3 insertions(+)libsepol/src/kernel_to_common.c +1
-0@@ -18,6 +18,7 @@#include <sepol/policydb/hashtab.h> #include <sepol/policydb/symtab.h> +#include "private.h" #include "kernel_to_common.h" libsepol/src/util.c +2
-1@@ -28,6 +28,8 @@#include <sepol/policydb/policydb.h> #include <sepol/policydb/util.h> +#include "private.h" +struct val_to_name {unsigned int val;char *name; --2.35.1.574.g5d30c73bfb-goog
Quoted 12 lines · James Carter
Quoted 7 lines · Thiébaud Weksteen
In f0a5f6e, calls to reallocarray were introduced. Ensure that the correct header (
private.h) is included when necessary.Fixes f0a5f6e ("libsepol: use reallocarray wrapper to avoid overflows")Test: Built using Android CI (glibc 2.17)
Signed-off-by Thiébaud Weksteen <[email protected]>Acked-by James Carter <[email protected]>
Merged.
Thanks,
Jim
Quoted 33 lines
Quoted 33 lines
--- libsepol/src/kernel_to_common.c | 1 + libsepol/src/util.c | 2 ++ 2 files changed, 3 insertions(+)libsepol/src/kernel_to_common.c +1
-0@@ -18,6 +18,7 @@#include <sepol/policydb/hashtab.h> #include <sepol/policydb/symtab.h> +#include "private.h" #include "kernel_to_common.h" libsepol/src/util.c +2
-1@@ -28,6 +28,8 @@#include <sepol/policydb/policydb.h> #include <sepol/policydb/util.h> +#include "private.h" +struct val_to_name {unsigned int val;char *name; --2.35.1.574.g5d30c73bfb-goog