diff mbox series

[1/1] libsepol: include module.c internal header in module_to_cil.c

Message ID 20190624193154.8453-1-nicolas.iooss@m4x.org (mailing list archive)
State Accepted
Headers show
Series [1/1] libsepol: include module.c internal header in module_to_cil.c | expand

Commit Message

Nicolas Iooss June 24, 2019, 7:31 p.m. UTC
In module_to_cil.c, sepol_ppfile_to_module_package() calls functions
from module.c without including the internal header. This makes building
libsepol with "gcc -flto -fuse-ld=gold" fails when linking libsepol.so:

    /tmp/ccHYAKVZ.ltrans21.ltrans.o:<artificial>:function
    sepol_ppfile_to_module_package: error: undefined reference to
    'sepol_module_package_free'
    /tmp/ccHYAKVZ.ltrans21.ltrans.o:<artificial>:function
    sepol_ppfile_to_module_package: error: undefined reference to
    'sepol_module_package_create'
    /tmp/ccHYAKVZ.ltrans21.ltrans.o:<artificial>:function
    sepol_ppfile_to_module_package: error: undefined reference to
    'sepol_module_package_create'
    collect2: error: ld returned 1 exit status

Fixes: https://github.com/SELinuxProject/selinux/issues/165

Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
---
 libsepol/src/module_to_cil.c | 1 +
 1 file changed, 1 insertion(+)

Comments

William Roberts June 25, 2019, 4 p.m. UTC | #1
ack, you going to to merge this?

On Mon, Jun 24, 2019 at 2:58 PM Nicolas Iooss <nicolas.iooss@m4x.org> wrote:
>
> In module_to_cil.c, sepol_ppfile_to_module_package() calls functions
> from module.c without including the internal header. This makes building
> libsepol with "gcc -flto -fuse-ld=gold" fails when linking libsepol.so:
>
>     /tmp/ccHYAKVZ.ltrans21.ltrans.o:<artificial>:function
>     sepol_ppfile_to_module_package: error: undefined reference to
>     'sepol_module_package_free'
>     /tmp/ccHYAKVZ.ltrans21.ltrans.o:<artificial>:function
>     sepol_ppfile_to_module_package: error: undefined reference to
>     'sepol_module_package_create'
>     /tmp/ccHYAKVZ.ltrans21.ltrans.o:<artificial>:function
>     sepol_ppfile_to_module_package: error: undefined reference to
>     'sepol_module_package_create'
>     collect2: error: ld returned 1 exit status
>
> Fixes: https://github.com/SELinuxProject/selinux/issues/165
>
> Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
> ---
>  libsepol/src/module_to_cil.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/libsepol/src/module_to_cil.c b/libsepol/src/module_to_cil.c
> index da62c8aaf0ef..1af166c9abd0 100644
> --- a/libsepol/src/module_to_cil.c
> +++ b/libsepol/src/module_to_cil.c
> @@ -54,6 +54,7 @@
>
>  #include "kernel_to_common.h"
>  #include "private.h"
> +#include "module_internal.h"
>
>  #ifdef __GNUC__
>  #  define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
> --
> 2.22.0
>
Nicolas Iooss June 26, 2019, 6:54 a.m. UTC | #2
On Tue, Jun 25, 2019 at 6:01 PM William Roberts
<bill.c.roberts@gmail.com> wrote:
>
> ack, you going to to merge this?

Yes, I merged it.

Thanks,
Nicolas

> On Mon, Jun 24, 2019 at 2:58 PM Nicolas Iooss <nicolas.iooss@m4x.org> wrote:
> >
> > In module_to_cil.c, sepol_ppfile_to_module_package() calls functions
> > from module.c without including the internal header. This makes building
> > libsepol with "gcc -flto -fuse-ld=gold" fails when linking libsepol.so:
> >
> >     /tmp/ccHYAKVZ.ltrans21.ltrans.o:<artificial>:function
> >     sepol_ppfile_to_module_package: error: undefined reference to
> >     'sepol_module_package_free'
> >     /tmp/ccHYAKVZ.ltrans21.ltrans.o:<artificial>:function
> >     sepol_ppfile_to_module_package: error: undefined reference to
> >     'sepol_module_package_create'
> >     /tmp/ccHYAKVZ.ltrans21.ltrans.o:<artificial>:function
> >     sepol_ppfile_to_module_package: error: undefined reference to
> >     'sepol_module_package_create'
> >     collect2: error: ld returned 1 exit status
> >
> > Fixes: https://github.com/SELinuxProject/selinux/issues/165
> >
> > Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
> > ---
> >  libsepol/src/module_to_cil.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/libsepol/src/module_to_cil.c b/libsepol/src/module_to_cil.c
> > index da62c8aaf0ef..1af166c9abd0 100644
> > --- a/libsepol/src/module_to_cil.c
> > +++ b/libsepol/src/module_to_cil.c
> > @@ -54,6 +54,7 @@
> >
> >  #include "kernel_to_common.h"
> >  #include "private.h"
> > +#include "module_internal.h"
> >
> >  #ifdef __GNUC__
> >  #  define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
> > --
> > 2.22.0
> >
diff mbox series

Patch

diff --git a/libsepol/src/module_to_cil.c b/libsepol/src/module_to_cil.c
index da62c8aaf0ef..1af166c9abd0 100644
--- a/libsepol/src/module_to_cil.c
+++ b/libsepol/src/module_to_cil.c
@@ -54,6 +54,7 @@ 
 
 #include "kernel_to_common.h"
 #include "private.h"
+#include "module_internal.h"
 
 #ifdef __GNUC__
 #  define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))