* [PATCH] libsepol: fix reallocarray imports
@ 2022-03-03 5:23 Thiébaud Weksteen
2022-03-04 19:53 ` James Carter
0 siblings, 1 reply; 3+ messages in thread
From: Thiébaud Weksteen @ 2022-03-03 5:23 UTC (permalink / raw)
To: selinux, Christian Göttsche
Cc: jeffv, alanstokes, 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 <tweek@google.com>
---
libsepol/src/kernel_to_common.c | 1 +
libsepol/src/util.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/libsepol/src/kernel_to_common.c b/libsepol/src/kernel_to_common.c
index dc9e689e..972499ab 100644
--- a/libsepol/src/kernel_to_common.c
+++ b/libsepol/src/kernel_to_common.c
@@ -18,6 +18,7 @@
#include <sepol/policydb/hashtab.h>
#include <sepol/policydb/symtab.h>
+#include "private.h"
#include "kernel_to_common.h"
diff --git a/libsepol/src/util.c b/libsepol/src/util.c
index b7230564..1cd1308d 100644
--- a/libsepol/src/util.c
+++ b/libsepol/src/util.c
@@ -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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] libsepol: fix reallocarray imports
2022-03-03 5:23 [PATCH] libsepol: fix reallocarray imports Thiébaud Weksteen
@ 2022-03-04 19:53 ` James Carter
2022-03-11 16:03 ` James Carter
0 siblings, 1 reply; 3+ messages in thread
From: James Carter @ 2022-03-04 19:53 UTC (permalink / raw)
To: Thiébaud Weksteen
Cc: SElinux list, Christian Göttsche, Jeffrey Vander Stoep,
Alan Stokes
On Thu, Mar 3, 2022 at 2:20 AM Thiébaud Weksteen <tweek@google.com> wrote:
>
> 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 <tweek@google.com>
Acked-by: James Carter <jwcart2@gmail.com>
> ---
> libsepol/src/kernel_to_common.c | 1 +
> libsepol/src/util.c | 2 ++
> 2 files changed, 3 insertions(+)
>
> diff --git a/libsepol/src/kernel_to_common.c b/libsepol/src/kernel_to_common.c
> index dc9e689e..972499ab 100644
> --- a/libsepol/src/kernel_to_common.c
> +++ b/libsepol/src/kernel_to_common.c
> @@ -18,6 +18,7 @@
> #include <sepol/policydb/hashtab.h>
> #include <sepol/policydb/symtab.h>
>
> +#include "private.h"
> #include "kernel_to_common.h"
>
>
> diff --git a/libsepol/src/util.c b/libsepol/src/util.c
> index b7230564..1cd1308d 100644
> --- a/libsepol/src/util.c
> +++ b/libsepol/src/util.c
> @@ -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
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] libsepol: fix reallocarray imports
2022-03-04 19:53 ` James Carter
@ 2022-03-11 16:03 ` James Carter
0 siblings, 0 replies; 3+ messages in thread
From: James Carter @ 2022-03-11 16:03 UTC (permalink / raw)
To: Thiébaud Weksteen
Cc: SElinux list, Christian Göttsche, Jeffrey Vander Stoep,
Alan Stokes
On Fri, Mar 4, 2022 at 2:53 PM James Carter <jwcart2@gmail.com> wrote:
>
> On Thu, Mar 3, 2022 at 2:20 AM Thiébaud Weksteen <tweek@google.com> wrote:
> >
> > 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 <tweek@google.com>
>
> Acked-by: James Carter <jwcart2@gmail.com>
>
Merged.
Thanks,
Jim
> > ---
> > libsepol/src/kernel_to_common.c | 1 +
> > libsepol/src/util.c | 2 ++
> > 2 files changed, 3 insertions(+)
> >
> > diff --git a/libsepol/src/kernel_to_common.c b/libsepol/src/kernel_to_common.c
> > index dc9e689e..972499ab 100644
> > --- a/libsepol/src/kernel_to_common.c
> > +++ b/libsepol/src/kernel_to_common.c
> > @@ -18,6 +18,7 @@
> > #include <sepol/policydb/hashtab.h>
> > #include <sepol/policydb/symtab.h>
> >
> > +#include "private.h"
> > #include "kernel_to_common.h"
> >
> >
> > diff --git a/libsepol/src/util.c b/libsepol/src/util.c
> > index b7230564..1cd1308d 100644
> > --- a/libsepol/src/util.c
> > +++ b/libsepol/src/util.c
> > @@ -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
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-11 16:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-03 5:23 [PATCH] libsepol: fix reallocarray imports Thiébaud Weksteen
2022-03-04 19:53 ` James Carter
2022-03-11 16:03 ` James Carter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.