| Message ID | 20200914080100.118667-1-xypron.glpk@gmx.de |
|---|---|
| State | Accepted |
| Commit | e5b35f706d13c8c0fffcf7b2af9c6df4f4190c5d |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | [1/1] log: mute messages generated by log drivers | expand |
On Mon, 14 Sep 2020 at 02:01, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote: > > When a message is written by a log driver (e.g. via the network stack) this > may result in the generation of further messages. We cannot allow these > additional messages to be emitted as this might result in an infinite > recursion. > > Up to now only the syslog driver was safeguarded. We should safeguard all > log drivers instead. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > --- > common/log.c | 13 ++++++++++++- > common/log_syslog.c | 8 -------- > 2 files changed, 12 insertions(+), 9 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Mon, 14 Sep 2020 at 02:01, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote: > > When a message is written by a log driver (e.g. via the network stack) this > may result in the generation of further messages. We cannot allow these > additional messages to be emitted as this might result in an infinite > recursion. > > Up to now only the syslog driver was safeguarded. We should safeguard all > log drivers instead. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > --- > common/log.c | 13 ++++++++++++- > common/log_syslog.c | 8 -------- > 2 files changed, 12 insertions(+), 9 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot-dm/next, thanks!
diff --git a/common/log.c b/common/log.c index 734d26de4a..9a5f100da3 100644 --- a/common/log.c +++ b/common/log.c @@ -191,12 +191,23 @@ static bool log_passes_filters(struct log_device *ldev, struct log_rec *rec) static int log_dispatch(struct log_rec *rec) { struct log_device *ldev; + static int processing_msg; + /* + * When a log driver writes messages (e.g. via the network stack) this + * may result in further generated messages. We cannot process them here + * as this might result in infinite recursion. + */ + if (processing_msg) + return 0; + + /* Emit message */ + processing_msg = 1; list_for_each_entry(ldev, &gd->log_head, sibling_node) { if (log_passes_filters(ldev, rec)) ldev->drv->emit(ldev, rec); } - + processing_msg = 0; return 0; } diff --git a/common/log_syslog.c b/common/log_syslog.c index 149ff5af31..2ae703fed7 100644 --- a/common/log_syslog.c +++ b/common/log_syslog.c @@ -35,16 +35,9 @@ static int log_syslog_emit(struct log_device *ldev, struct log_rec *rec) char *log_msg; int eth_hdr_size; struct in_addr bcast_ip; - static int processing_msg; unsigned int log_level; char *log_hostname; - /* Fend off messages from the network stack while writing a message */ - if (processing_msg) - return 0; - - processing_msg = 1; - /* Setup packet buffers */ net_init(); /* Disable hardware and put it into the reset state */ @@ -108,7 +101,6 @@ static int log_syslog_emit(struct log_device *ldev, struct log_rec *rec) net_send_packet((uchar *)msg, ptr - msg); out: - processing_msg = 0; return ret; }
When a message is written by a log driver (e.g. via the network stack) this may result in the generation of further messages. We cannot allow these additional messages to be emitted as this might result in an infinite recursion. Up to now only the syslog driver was safeguarded. We should safeguard all log drivers instead. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- common/log.c | 13 ++++++++++++- common/log_syslog.c | 8 -------- 2 files changed, 12 insertions(+), 9 deletions(-) -- 2.28.0