OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix locking in fmtmsg

This commit is contained in:
Ulrich Drepper 2012-02-24 21:18:04 -05:00
parent 6b1d1d46b9
commit 7724defcf8
2 changed files with 68 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,7 +1,11 @@
2012-02-24 Ulrich Drepper <drepper@gmail.com>
* stdlib/fmtmsg.c (fmtmsg): Lock around use of severity list.
Reported by Peng Haitao <penght@cn.fujitsu.com>.
2012-02-24 Joseph Myers <joseph@codesourcery.com>
* configure.in: Use -o not -a in test for unsupported multi-arch.
* configure: Regenerated.
2012-02-24 Joseph Myers <joseph@codesourcery.com>

119
stdlib/fmtmsg.c
View File

@ -103,7 +103,6 @@ fmtmsg (long int classification, const char *label, int severity,
const char *text, const char *action, const char *tag)
{
__libc_once_define (static, once);
int result = MM_OK;
struct severity_info *severity_rec;
/* Make sure everything is initialized. */
@ -124,17 +123,6 @@ fmtmsg (long int classification, const char *label, int severity,
return MM_NOTOK;
}
for (severity_rec = severity_list; severity_rec != NULL;
severity_rec = severity_rec->next)
if (severity == severity_rec->severity)
/* Bingo. */
break;
/* If we don't know anything about the severity level return an error. */
if (severity_rec == NULL)
return MM_NOTOK;
#ifdef __libc_ptf_call
/* We do not want this call to be cut short by a thread
cancellation. Therefore disable cancellation for now. */
@ -143,53 +131,72 @@ fmtmsg (long int classification, const char *label, int severity,
0);
#endif
/* Now we can print. */
if (classification & MM_PRINT)
{
int do_label = (print & label_mask) && label != MM_NULLLBL;
int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
int do_text = (print & text_mask) && text != MM_NULLTXT;
int do_action = (print & action_mask) && action != MM_NULLACT;
int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
__libc_lock_lock (lock);
if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
do_label ? label : "",
do_label && (do_severity | do_text | do_action | do_tag)
? ": " : "",
do_severity ? severity_rec->string : "",
do_severity && (do_text | do_action | do_tag)
? ": " : "",
do_text ? text : "",
do_text && (do_action | do_tag) ? "\n" : "",
do_action ? "TO FIX: " : "",
do_action ? action : "",
do_action && do_tag ? " " : "",
do_tag ? tag : "") < 0)
/* Oh, oh. An error occurred during the output. */
result = MM_NOMSG;
for (severity_rec = severity_list; severity_rec != NULL;
severity_rec = severity_rec->next)
if (severity == severity_rec->severity)
/* Bingo. */
break;
/* If we don't know anything about the severity level return an error. */
int result = MM_NOTOK;
if (severity_rec != NULL)
{
result = MM_OK;
/* Now we can print. */
if (classification & MM_PRINT)
{
int do_label = (print & label_mask) && label != MM_NULLLBL;
int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
int do_text = (print & text_mask) && text != MM_NULLTXT;
int do_action = (print & action_mask) && action != MM_NULLACT;
int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
int need_colon = (do_label
&& (do_severity | do_text | do_action | do_tag));
if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
do_label ? label : "",
need_colon ? ": " : "",
do_severity ? severity_rec->string : "",
do_severity && (do_text | do_action | do_tag)
? ": " : "",
do_text ? text : "",
do_text && (do_action | do_tag) ? "\n" : "",
do_action ? "TO FIX: " : "",
do_action ? action : "",
do_action && do_tag ? " " : "",
do_tag ? tag : "") < 0)
/* Oh, oh. An error occurred during the output. */
result = MM_NOMSG;
}
if (classification & MM_CONSOLE)
{
int do_label = label != MM_NULLLBL;
int do_severity = severity != MM_NULLSEV;
int do_text = text != MM_NULLTXT;
int do_action = action != MM_NULLACT;
int do_tag = tag != MM_NULLTAG;
int need_colon = (do_label
&& (do_severity | do_text | do_action | do_tag));
syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
do_label ? label : "",
need_colon ? ": " : "",
do_severity ? severity_rec->string : "",
do_severity && (do_text | do_action | do_tag) ? ": " : "",
do_text ? text : "",
do_text && (do_action | do_tag) ? "\n" : "",
do_action ? "TO FIX: " : "",
do_action ? action : "",
do_action && do_tag ? " " : "",
do_tag ? tag : "");
}
}
if (classification & MM_CONSOLE)
{
int do_label = label != MM_NULLLBL;
int do_severity = severity != MM_NULLSEV;
int do_text = text != MM_NULLTXT;
int do_action = action != MM_NULLACT;
int do_tag = tag != MM_NULLTAG;
syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
do_label ? label : "",
do_label && (do_severity | do_text | do_action | do_tag)
? ": " : "",
do_severity ? severity_rec->string : "",
do_severity && (do_text | do_action | do_tag) ? ": " : "",
do_text ? text : "",
do_text && (do_action | do_tag) ? "\n" : "",
do_action ? "TO FIX: " : "",
do_action ? action : "",
do_action && do_tag ? " " : "",
do_tag ? tag : "");
}
__libc_lock_unlock (lock);
#ifdef __libc_ptf_call
__libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);