Add inhibit_stack_protector to ifuncmain9 [BZ #25680]

Message ID CAFn_OkF2t7y1-Od30L1N9ik8xv=krF30uR8qvjsPpXn7V3Y2iQ@mail.gmail.com
State New
Headers show
Series
  • Add inhibit_stack_protector to ifuncmain9 [BZ #25680]
Related show

Commit Message

Adhemerval Zanella via Libc-alpha June 25, 2020, 2:34 a.m.
Enabling --enable-stack-protector=all causes the following tests to fail:

    FAIL: elf/ifuncmain9picstatic
    FAIL: elf/ifuncmain9static

Nick Alcock (who committed the stack protector code) marked the IFUNC
resolvers with inhibit_stack_protector when he done the original work and
suggested doing so again @ BZ #25680. This patch adds
inhibit_stack_protector to ifuncmain9.

After patch is applied, --enable-stack-protector=all does not fail the
above tests.


ChangeLog:

2020-06-24 Dave Hughes <davidhughes205@gmail.com>

        COMMIT: d3dfcedb2fffe54a9a9a75068f74c1f1dfb82fdf
        Add inhibit_stack_protector to ifuncmain9 to fix failing tests BZ
#25680

        * elf/ifuncmain9.c: added inhibit_stack_protector to ifunc resolver.


---
 elf/ifuncmain9.c | 1 +
 1 file changed, 1 insertion(+)

-- 
2.27.0

Comments

Adhemerval Zanella via Libc-alpha June 27, 2020, 1:25 p.m. | #1
On Wed, Jun 24, 2020 at 7:34 PM David Hughes via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>

> Enabling --enable-stack-protector=all causes the following tests to fail:

>

>     FAIL: elf/ifuncmain9picstatic

>     FAIL: elf/ifuncmain9static

>

> Nick Alcock (who committed the stack protector code) marked the IFUNC

> resolvers with inhibit_stack_protector when he done the original work and

> suggested doing so again @ BZ #25680. This patch adds

> inhibit_stack_protector to ifuncmain9.

>

> After patch is applied, --enable-stack-protector=all does not fail the

> above tests.

>

>

> ChangeLog:

>

> 2020-06-24 Dave Hughes <davidhughes205@gmail.com>

>

>         COMMIT: d3dfcedb2fffe54a9a9a75068f74c1f1dfb82fdf

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ What is this commit?
>         Add inhibit_stack_protector to ifuncmain9 to fix failing tests BZ

> #25680

>

>         * elf/ifuncmain9.c: added inhibit_stack_protector to ifunc resolver.

>

>

> ---

>  elf/ifuncmain9.c | 1 +

>  1 file changed, 1 insertion(+)

>

> diff --git a/elf/ifuncmain9.c b/elf/ifuncmain9.c

> index 0d3429341c..1c9ba89839 100644

> --- a/elf/ifuncmain9.c

> +++ b/elf/ifuncmain9.c

> @@ -43,6 +43,7 @@ implementation (void)

>  }

>

>  static __typeof__ (implementation) *

> +inhibit_stack_protector

>  resolver (void)

>  {

>    ++resolver_called;

> --

> 2.27.0


LGTM, except for "COMMIT: d3dfcedb2fffe54a9a9a75068f74c1f1dfb82fdf".

Thanks.

-- 
H.J.

Patch

diff --git a/elf/ifuncmain9.c b/elf/ifuncmain9.c
index 0d3429341c..1c9ba89839 100644
--- a/elf/ifuncmain9.c
+++ b/elf/ifuncmain9.c
@@ -43,6 +43,7 @@  implementation (void)
 }

 static __typeof__ (implementation) *
+inhibit_stack_protector
 resolver (void)
 {
   ++resolver_called;