From 9aec6d2a2f2388b08db6af7c2369d8e694d82c9a Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 7 Jul 2015 06:09:29 -0700 Subject: [PATCH] Add la_symbind32 to x86-64 audit tests la_symbind32 is used for x32 in x86-64 audit tests. We should define both la_symbind32 and la_symbind64 in x86-64 audit tests. * sysdeps/x86_64/tst-auditmod10b.c (la_symbind32): New. * sysdeps/x86_64/tst-auditmod4b.c (la_symbind32): Likewise. * sysdeps/x86_64/tst-auditmod5b.c (la_symbind32): Likewise. * sysdeps/x86_64/tst-auditmod6b.c (la_symbind32): Likewise. * sysdeps/x86_64/tst-auditmod6c.c (la_symbind32): Likewise. * sysdeps/x86_64/tst-auditmod7b.c (la_symbind32): Likewise. --- ChangeLog | 9 +++++++++ sysdeps/x86_64/tst-auditmod10b.c | 10 ++++++++++ sysdeps/x86_64/tst-auditmod4b.c | 10 ++++++++++ sysdeps/x86_64/tst-auditmod5b.c | 10 ++++++++++ sysdeps/x86_64/tst-auditmod6b.c | 10 ++++++++++ sysdeps/x86_64/tst-auditmod6c.c | 10 ++++++++++ sysdeps/x86_64/tst-auditmod7b.c | 10 ++++++++++ 7 files changed, 69 insertions(+) diff --git a/ChangeLog b/ChangeLog index 35347e2320..e00fd0d533 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-07-07 H.J. Lu + + * sysdeps/x86_64/tst-auditmod10b.c (la_symbind32): New. + * sysdeps/x86_64/tst-auditmod4b.c (la_symbind32): Likewise. + * sysdeps/x86_64/tst-auditmod5b.c (la_symbind32): Likewise. + * sysdeps/x86_64/tst-auditmod6b.c (la_symbind32): Likewise. + * sysdeps/x86_64/tst-auditmod6c.c (la_symbind32): Likewise. + * sysdeps/x86_64/tst-auditmod7b.c (la_symbind32): Likewise. + 2015-07-07 H.J. Lu * sysdeps/i386/Makefile (gen-as-const-headers)[elf]: Add diff --git a/sysdeps/x86_64/tst-auditmod10b.c b/sysdeps/x86_64/tst-auditmod10b.c index 9bb6127b81..0eb36747d2 100644 --- a/sysdeps/x86_64/tst-auditmod10b.c +++ b/sysdeps/x86_64/tst-auditmod10b.c @@ -101,6 +101,16 @@ la_objclose (uintptr_t *cookie) return 0; } +uintptr_t +la_symbind32 (Elf32_Sym *sym, unsigned int ndx, uintptr_t *refcook, + uintptr_t *defcook, unsigned int *flags, const char *symname) +{ + printf ("symbind32: symname=%s, st_value=%#lx, ndx=%u, flags=%u\n", + symname, (long int) sym->st_value, ndx, *flags); + + return sym->st_value; +} + uintptr_t la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook, uintptr_t *defcook, unsigned int *flags, const char *symname) diff --git a/sysdeps/x86_64/tst-auditmod4b.c b/sysdeps/x86_64/tst-auditmod4b.c index 80aaedcd3e..2b0d827e88 100644 --- a/sysdeps/x86_64/tst-auditmod4b.c +++ b/sysdeps/x86_64/tst-auditmod4b.c @@ -84,6 +84,16 @@ la_objclose (uintptr_t *cookie) return 0; } +uintptr_t +la_symbind32 (Elf32_Sym *sym, unsigned int ndx, uintptr_t *refcook, + uintptr_t *defcook, unsigned int *flags, const char *symname) +{ + printf ("symbind32: symname=%s, st_value=%#lx, ndx=%u, flags=%u\n", + symname, (long int) sym->st_value, ndx, *flags); + + return sym->st_value; +} + uintptr_t la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook, uintptr_t *defcook, unsigned int *flags, const char *symname) diff --git a/sysdeps/x86_64/tst-auditmod5b.c b/sysdeps/x86_64/tst-auditmod5b.c index 576183d722..a74d261f03 100644 --- a/sysdeps/x86_64/tst-auditmod5b.c +++ b/sysdeps/x86_64/tst-auditmod5b.c @@ -85,6 +85,16 @@ la_objclose (uintptr_t *cookie) return 0; } +uintptr_t +la_symbind32 (Elf32_Sym *sym, unsigned int ndx, uintptr_t *refcook, + uintptr_t *defcook, unsigned int *flags, const char *symname) +{ + printf ("symbind32: symname=%s, st_value=%#lx, ndx=%u, flags=%u\n", + symname, (long int) sym->st_value, ndx, *flags); + + return sym->st_value; +} + uintptr_t la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook, uintptr_t *defcook, unsigned int *flags, const char *symname) diff --git a/sysdeps/x86_64/tst-auditmod6b.c b/sysdeps/x86_64/tst-auditmod6b.c index b1c155a26e..886fc33e9b 100644 --- a/sysdeps/x86_64/tst-auditmod6b.c +++ b/sysdeps/x86_64/tst-auditmod6b.c @@ -84,6 +84,16 @@ la_objclose (uintptr_t *cookie) return 0; } +uintptr_t +la_symbind32 (Elf32_Sym *sym, unsigned int ndx, uintptr_t *refcook, + uintptr_t *defcook, unsigned int *flags, const char *symname) +{ + printf ("symbind32: symname=%s, st_value=%#lx, ndx=%u, flags=%u\n", + symname, (long int) sym->st_value, ndx, *flags); + + return sym->st_value; +} + uintptr_t la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook, uintptr_t *defcook, unsigned int *flags, const char *symname) diff --git a/sysdeps/x86_64/tst-auditmod6c.c b/sysdeps/x86_64/tst-auditmod6c.c index 88adb21aa1..b2ee24d8bf 100644 --- a/sysdeps/x86_64/tst-auditmod6c.c +++ b/sysdeps/x86_64/tst-auditmod6c.c @@ -84,6 +84,16 @@ la_objclose (uintptr_t *cookie) return 0; } +uintptr_t +la_symbind32 (Elf32_Sym *sym, unsigned int ndx, uintptr_t *refcook, + uintptr_t *defcook, unsigned int *flags, const char *symname) +{ + printf ("symbind32: symname=%s, st_value=%#lx, ndx=%u, flags=%u\n", + symname, (long int) sym->st_value, ndx, *flags); + + return sym->st_value; +} + uintptr_t la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook, uintptr_t *defcook, unsigned int *flags, const char *symname) diff --git a/sysdeps/x86_64/tst-auditmod7b.c b/sysdeps/x86_64/tst-auditmod7b.c index 68052efe97..f27076d3bb 100644 --- a/sysdeps/x86_64/tst-auditmod7b.c +++ b/sysdeps/x86_64/tst-auditmod7b.c @@ -84,6 +84,16 @@ la_objclose (uintptr_t *cookie) return 0; } +uintptr_t +la_symbind32 (Elf32_Sym *sym, unsigned int ndx, uintptr_t *refcook, + uintptr_t *defcook, unsigned int *flags, const char *symname) +{ + printf ("symbind32: symname=%s, st_value=%#lx, ndx=%u, flags=%u\n", + symname, (long int) sym->st_value, ndx, *flags); + + return sym->st_value; +} + uintptr_t la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook, uintptr_t *defcook, unsigned int *flags, const char *symname)