diff mbox series

[scarthgap] libpam: re-add missing libgen include

Message ID 20250801100708.2925411-1-martin.jansa@gmail.com
State Under Review
Delegated to: Steve Sakoman
Headers show
Series [scarthgap] libpam: re-add missing libgen include | expand

Commit Message

Martin Jansa Aug. 1, 2025, 10:07 a.m. UTC 
From: Martin Jansa <martin.jansa@gmail.com>

It was added by original commit for CVE-2025-6020-01.patch
https://github.com/linux-pam/linux-pam/commit/475bd60c552b98c7eddb3270b0b4196847c0072e#diff-05f443e6acbe32a148a45648148739bf6f02f13acc5c20c6037bf933223d4d77
but removed here in the rebase, causing:

../../../Linux-PAM-1.5.3/modules/pam_namespace/pam_namespace.c:326:11: error: call to undeclared function 'dirname'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
  326 |         parent = dirname(buf);
      |                  ^
../../../Linux-PAM-1.5.3/modules/pam_namespace/pam_namespace.c:326:9: error: incompatible integer to pointer conversion assigning to 'char*' from 'int' [-Wint-conversion]
  326 |         parent = dirname(buf);
      |                ^ ~~~~~~~~~~~~

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
 .../pam/libpam/0002-pam-namespace-rebase.patch                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Steve Sakoman Aug. 1, 2025, 2:41 p.m. UTC | #1 
Thanks Martin!

Any theories on why I didn't see this error on local or autobuilder testing?

Steve

On Fri, Aug 1, 2025 at 3:07 AM <martin.jansa@gmail.com> wrote:
>
> From: Martin Jansa <martin.jansa@gmail.com>
>
> It was added by original commit for CVE-2025-6020-01.patch
> https://github.com/linux-pam/linux-pam/commit/475bd60c552b98c7eddb3270b0b4196847c0072e#diff-05f443e6acbe32a148a45648148739bf6f02f13acc5c20c6037bf933223d4d77
> but removed here in the rebase, causing:
>
> ../../../Linux-PAM-1.5.3/modules/pam_namespace/pam_namespace.c:326:11: error: call to undeclared function 'dirname'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
>   326 |         parent = dirname(buf);
>       |                  ^
> ../../../Linux-PAM-1.5.3/modules/pam_namespace/pam_namespace.c:326:9: error: incompatible integer to pointer conversion assigning to 'char*' from 'int' [-Wint-conversion]
>   326 |         parent = dirname(buf);
>       |                ^ ~~~~~~~~~~~~
>
> Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
> ---
>  .../pam/libpam/0002-pam-namespace-rebase.patch                | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-extended/pam/libpam/0002-pam-namespace-rebase.patch b/meta/recipes-extended/pam/libpam/0002-pam-namespace-rebase.patch
> index ff5a8a4946..c57011da0b 100644
> --- a/meta/recipes-extended/pam/libpam/0002-pam-namespace-rebase.patch
> +++ b/meta/recipes-extended/pam/libpam/0002-pam-namespace-rebase.patch
> @@ -714,7 +714,7 @@ diff --git a/modules/pam_namespace/pam_namespace.h b/modules/pam_namespace/pam_n
>  index a991b4c..180e042 100644
>  --- a/modules/pam_namespace/pam_namespace.h
>  +++ b/modules/pam_namespace/pam_namespace.h
> -@@ -44,21 +44,16 @@
> +@@ -44,21 +44,17 @@
>   #include <stdlib.h>
>   #include <errno.h>
>   #include <syslog.h>
> @@ -728,7 +728,7 @@ index a991b4c..180e042 100644
>  -#include <sys/resource.h>
>   #include <sys/mount.h>
>   #include <sys/wait.h>
> --#include <libgen.h>
> + #include <libgen.h>
>   #include <fcntl.h>
>   #include <sched.h>
>   #include <glob.h>
Martin Jansa Aug. 1, 2025, 2:43 p.m. UTC | #2 
On Fri, Aug 1, 2025 at 4:42 PM Steve Sakoman <steve@sakoman.com> wrote:
>
> Thanks Martin!
>
> Any theories on why I didn't see this error on local or autobuilder testing?

I've seen it in build with clang which is more strict than older gcc
used in scarthgap.
Steve Sakoman Aug. 1, 2025, 3:03 p.m. UTC | #3 
On Fri, Aug 1, 2025 at 7:43 AM Martin Jansa <martin.jansa@gmail.com> wrote:
>
> On Fri, Aug 1, 2025 at 4:42 PM Steve Sakoman <steve@sakoman.com> wrote:
> >
> > Thanks Martin!
> >
> > Any theories on why I didn't see this error on local or autobuilder testing?
>
> I've seen it in build with clang which is more strict than older gcc
> used in scarthgap.

Makes sense, thanks!

Steve
diff mbox series

Patch

diff --git a/meta/recipes-extended/pam/libpam/0002-pam-namespace-rebase.patch b/meta/recipes-extended/pam/libpam/0002-pam-namespace-rebase.patch
index ff5a8a4946..c57011da0b 100644
--- a/meta/recipes-extended/pam/libpam/0002-pam-namespace-rebase.patch
+++ b/meta/recipes-extended/pam/libpam/0002-pam-namespace-rebase.patch
@@ -714,7 +714,7 @@  diff --git a/modules/pam_namespace/pam_namespace.h b/modules/pam_namespace/pam_n
 index a991b4c..180e042 100644
 --- a/modules/pam_namespace/pam_namespace.h
 +++ b/modules/pam_namespace/pam_namespace.h
-@@ -44,21 +44,16 @@
+@@ -44,21 +44,17 @@
  #include <stdlib.h>
  #include <errno.h>
  #include <syslog.h>
@@ -728,7 +728,7 @@  index a991b4c..180e042 100644
 -#include <sys/resource.h>
  #include <sys/mount.h>
  #include <sys/wait.h>
--#include <libgen.h>
+ #include <libgen.h>
  #include <fcntl.h>
  #include <sched.h>
  #include <glob.h>