Skip to content

syslog: Don't allow blocking when in signal handler #14456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Oct 23, 2024
Merged

syslog: Don't allow blocking when in signal handler #14456

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 38 additions & 1 deletion drivers/syslog/syslog_write.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,43 @@
* Private Functions
****************************************************************************/

/****************************************************************************
* Name: syslog_safe_to_block
*
* Description:
* Check if it is safe to block for write. If not, the write defaults to a
* non-blocking method.
*
* Input Parameters:
* None.
*
* Returned Value:
* true if it is safe to block; false otherwise.
*
****************************************************************************/

static bool syslog_safe_to_block(void)
{
FAR const struct tcb_s *rtcb;

/* It's not safe to block in interrupts or when executing the idle loop */

if (up_interrupt_context() || sched_idletask())
{
return false;
}

/* It's not safe to block if a signal is being delivered */

rtcb = nxsched_self();
if (rtcb->sigdeliver != NULL)
{
return false;
}

return true;
}

/****************************************************************************
* Name: syslog_default_write
*
Expand All @@ -59,7 +96,7 @@ static ssize_t syslog_default_write(FAR const char *buffer, size_t buflen)
{
size_t nwritten;

if (up_interrupt_context() || sched_idletask())
if (!syslog_safe_to_block())
{
#ifdef CONFIG_SYSLOG_INTBUFFER
if (up_interrupt_context())
Expand Down