lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Fix getpass fflush_unlocked namespace (bug 18540).

Browse Source 
The getpass function (XPG3 / XPG4 / UNIX98) calls fflush_unlocked (not
in any of those standards).  This patch fixes this by making
fflush_unlocked into a weak alias for __fflush_unlocked and calling
__fflush_unlocked from getpass.

Tested for x86_64 and x86 (testsuite, and that disassembly of
installed stripped shared libraries is unchanged by the patch).

	[BZ #18540]
	* libio/iofflush.c [!_IO_MTSAFE_IO] (__fflush_unlocked): Define as
	strong alias of _IO_fflush.  Use libc_hidden_def.
	* libio/iofflush_u.c (fflush_unlocked): Rename to
	__fflush_unlocked and define as weak alias of __fflush_unlocked.
	Use libc_hidden_weak.
	* include/stdio.h (__fflush_unlocked): Declare.  Use
	libc_hidden_proto.
	* misc/getpass.c (getpass): Call __fflush_unlocked instead of
	fflush_unlocked.
	* conform/Makefile (test-xfail-UNIX98/unistd.h/linknamespace):
	Remove variable.
This commit is contained in:
Joseph Myers
2015-06-17 20:14:18 +00:00
parent 68f1ba4ba4
commit eb1fae6a45
7 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,5 +1,18 @@
2015-06-17 Joseph Myers <joseph@codesourcery.com> 2015-06-17 Joseph Myers <joseph@codesourcery.com>
[BZ #18540]
* libio/iofflush.c [!_IO_MTSAFE_IO] (__fflush_unlocked): Define as
strong alias of _IO_fflush. Use libc_hidden_def.
* libio/iofflush_u.c (fflush_unlocked): Rename to
__fflush_unlocked and define as weak alias of __fflush_unlocked.
Use libc_hidden_weak.
* include/stdio.h (__fflush_unlocked): Declare. Use
libc_hidden_proto.
* misc/getpass.c (getpass): Call __fflush_unlocked instead of
fflush_unlocked.
* conform/Makefile (test-xfail-UNIX98/unistd.h/linknamespace):
Remove variable.
[BZ #18539] [BZ #18539]
* stdlib/fmtmsg.c (addseverity): Rename to __addseverity and * stdlib/fmtmsg.c (addseverity): Rename to __addseverity and
define as weak alias of __addseverity. define as weak alias of __addseverity.

2
NEWS
View File

@ -22,7 +22,7 @@ Version 2.22
18324, 18333, 18346, 18397, 18409, 18410, 18412, 18418, 18422, 18434, 18324, 18333, 18346, 18397, 18409, 18410, 18412, 18418, 18422, 18434,
18444, 18468, 18469, 18470, 18479, 18483, 18495, 18496, 18497, 18498, 18444, 18468, 18469, 18470, 18479, 18483, 18495, 18496, 18497, 18498,
18507, 18512, 18519, 18520, 18522, 18527, 18528, 18529, 18530, 18532, 18507, 18512, 18519, 18520, 18522, 18527, 18528, 18529, 18530, 18532,
18533, 18534, 18536, 18539. 18533, 18534, 18536, 18539, 18540.
* Cache information can be queried via sysconf() function on s390 e.g. with * Cache information can be queried via sysconf() function on s390 e.g. with
_SC_LEVEL1_ICACHE_SIZE as argument. _SC_LEVEL1_ICACHE_SIZE as argument.

1
conform/Makefile
View File

@ -348,5 +348,4 @@ test-xfail-XPG3/unistd.h/linknamespace = yes
test-xfail-XPG4/unistd.h/linknamespace = yes test-xfail-XPG4/unistd.h/linknamespace = yes
test-xfail-POSIX/mqueue.h/linknamespace = yes test-xfail-POSIX/mqueue.h/linknamespace = yes
test-xfail-UNIX98/mqueue.h/linknamespace = yes test-xfail-UNIX98/mqueue.h/linknamespace = yes
test-xfail-UNIX98/unistd.h/linknamespace = yes
test-xfail-UNIX98/wchar.h/linknamespace = yes test-xfail-UNIX98/wchar.h/linknamespace = yes

2
include/stdio.h
View File

@ -155,6 +155,8 @@ extern __typeof (ftello) __ftello;
libc_hidden_proto (__ftello) libc_hidden_proto (__ftello)
libc_hidden_proto (fflush) libc_hidden_proto (fflush)
libc_hidden_proto (fflush_unlocked) libc_hidden_proto (fflush_unlocked)
extern __typeof (fflush_unlocked) __fflush_unlocked;
libc_hidden_proto (__fflush_unlocked)
extern __typeof (fread_unlocked) __fread_unlocked; extern __typeof (fread_unlocked) __fread_unlocked;
libc_hidden_proto (__fread_unlocked) libc_hidden_proto (__fread_unlocked)
libc_hidden_proto (fwrite_unlocked) libc_hidden_proto (fwrite_unlocked)

2
libio/iofflush.c
View File

@ -50,6 +50,8 @@ weak_alias (_IO_fflush, fflush)
libc_hidden_weak (fflush) libc_hidden_weak (fflush)
#ifndef _IO_MTSAFE_IO #ifndef _IO_MTSAFE_IO
strong_alias (_IO_fflush, __fflush_unlocked)
libc_hidden_def (__fflush_unlocked)
weak_alias (_IO_fflush, fflush_unlocked) weak_alias (_IO_fflush, fflush_unlocked)
libc_hidden_weak (fflush_unlocked) libc_hidden_weak (fflush_unlocked)
#endif #endif

6
libio/iofflush_u.c
View File

@ -28,7 +28,7 @@
#include <stdio.h> #include <stdio.h>
int int
fflush_unlocked (fp) __fflush_unlocked (fp)
_IO_FILE *fp; _IO_FILE *fp;
{ {
if (fp == NULL) if (fp == NULL)
@ -39,4 +39,6 @@ fflush_unlocked (fp)
return _IO_SYNC (fp) ? EOF : 0; return _IO_SYNC (fp) ? EOF : 0;
} }
} }
libc_hidden_def (fflush_unlocked) libc_hidden_def (__fflush_unlocked)
weak_alias (__fflush_unlocked, fflush_unlocked)
libc_hidden_weak (fflush_unlocked)

2
misc/getpass.c
View File

@ -91,7 +91,7 @@ getpass (prompt)
/* Write the prompt. */ /* Write the prompt. */
__fxprintf (out, "%s", prompt); __fxprintf (out, "%s", prompt);
fflush_unlocked (out); __fflush_unlocked (out);
/* Read the password. */ /* Read the password. */
nread = __getline (&buf, &bufsize, in); nread = __getline (&buf, &bufsize, in);