mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-23 17:53:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix output of LD_SHOW_AUXV=1.

Browse Source 
Starting with commit 1616d034b6
the output was corrupted on some platforms as _dl_procinfo
was called for every auxv entry and on some architectures like s390
all entries were represented as "AT_HWCAP".

This patch is removing the condition and let _dl_procinfo decide if
an entry is printed in a platform specific or generic way.
This patch also adjusts all _dl_procinfo implementations which assumed
that they are only called for AT_HWCAP or AT_HWCAP2. They are now just
returning a non-zero-value for entries which are not handled platform
specifc.

ChangeLog:

	* elf/dl-sysdep.c (_dl_show_auxv): Remove condition and always
	call _dl_procinfo.
	* sysdeps/unix/sysv/linux/s390/dl-procinfo.h (_dl_procinfo):
	Ignore types other than AT_HWCAP.
	* sysdeps/sparc/dl-procinfo.h (_dl_procinfo): Likewise.
	* sysdeps/unix/sysv/linux/i386/dl-procinfo.h (_dl_procinfo):
	Likewise.
	* sysdeps/powerpc/dl-procinfo.h (_dl_procinfo): Adjust comment
	in the case of falling back to generic output mechanism.
	* sysdeps/unix/sysv/linux/arm/dl-procinfo.h (_dl_procinfo):
	Likewise.

(cherry picked from commit 7c6513082b)

Conflicts:
	ChangeLog
This commit is contained in:
Stefan Liebler 2019-03-13 10:45:35 +01:00
parent 067fc32968
commit bc6f839fb4
7 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2019-03-13 Stefan Liebler <stli@linux.ibm.com>
* elf/dl-sysdep.c (_dl_show_auxv): Remove condition and always
call _dl_procinfo.
* sysdeps/unix/sysv/linux/s390/dl-procinfo.h (_dl_procinfo):
Ignore types other than AT_HWCAP.
* sysdeps/sparc/dl-procinfo.h (_dl_procinfo): Likewise.
* sysdeps/unix/sysv/linux/i386/dl-procinfo.h (_dl_procinfo):
Likewise.
* sysdeps/powerpc/dl-procinfo.h (_dl_procinfo): Adjust comment
in the case of falling back to generic output mechanism.
* sysdeps/unix/sysv/linux/arm/dl-procinfo.h (_dl_procinfo):
Likewise.
2019-02-15 Florian Weimer <fweimer@redhat.com>
[BZ #24211]

11
elf/dl-sysdep.c
View File

@ -328,14 +328,9 @@ _dl_show_auxv (void)
assert (AT_NULL == 0);
assert (AT_IGNORE == 1);
if (av->a_type == AT_HWCAP || av->a_type == AT_HWCAP2
|| AT_L1I_CACHEGEOMETRY || AT_L1D_CACHEGEOMETRY
|| AT_L2_CACHEGEOMETRY || AT_L3_CACHEGEOMETRY)
{
/* These are handled in a special way per platform. */
if (_dl_procinfo (av->a_type, av->a_un.a_val) == 0)
continue;
}
/* Some entries are handled in a special way per platform. */
if (_dl_procinfo (av->a_type, av->a_un.a_val) == 0)
continue;
if (idx < sizeof (auxvars) / sizeof (auxvars[0])
&& auxvars[idx].form != unknown)

2
sysdeps/powerpc/dl-procinfo.h
View File

@ -225,7 +225,7 @@ _dl_procinfo (unsigned int type, unsigned long int word)
break;
}
default:
/* This should not happen. */
/* Fallback to generic output mechanism. */
return -1;
}
_dl_printf ("\n");

4
sysdeps/sparc/dl-procinfo.h
View File

@ -31,8 +31,8 @@ _dl_procinfo (unsigned int type, unsigned long int word)
{
int i;
/* Fallback to unknown output mechanism. */
if (type == AT_HWCAP2)
/* Fallback to generic output mechanism. */
if (type != AT_HWCAP)
return -1;
_dl_printf ("AT_HWCAP: ");

2
sysdeps/unix/sysv/linux/arm/dl-procinfo.h
View File

@ -67,7 +67,7 @@ _dl_procinfo (unsigned int type, unsigned long int word)
break;
}
default:
/* This should not happen. */
/* Fallback to generic output mechanism. */
return -1;
}
_dl_printf ("\n");

4
sysdeps/unix/sysv/linux/i386/dl-procinfo.h
View File

@ -30,8 +30,8 @@ _dl_procinfo (unsigned int type, unsigned long int word)
in the kernel sources. */
int i;
/* Fallback to unknown output mechanism. */
if (type == AT_HWCAP2)
/* Fallback to generic output mechanism. */
if (type != AT_HWCAP)
return -1;
_dl_printf ("AT_HWCAP: ");

4
sysdeps/unix/sysv/linux/s390/dl-procinfo.h
View File

@ -32,8 +32,8 @@ _dl_procinfo (unsigned int type, unsigned long int word)
in the kernel sources. */
int i;
/* Fallback to unknown output mechanism. */
if (type == AT_HWCAP2)
/* Fallback to generic output mechanism. */
if (type != AT_HWCAP)
return -1;
_dl_printf ("AT_HWCAP: ");