From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Blunck Subject: [PATCH v2] log: Properly reset log_history_size in rte_log_dump_history() Date: Mon, 1 Jun 2015 11:30:38 +0200 Message-ID: <1433151038-630-1-git-send-email-jblunck@infradead.org> References: <1432895688-1728-1-git-send-email-jblunck@infradead.org> To: dev@dpdk.org Return-path: Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com [74.125.82.46]) by dpdk.org (Postfix) with ESMTP id 9AF2F58C3 for ; Mon, 1 Jun 2015 11:30:53 +0200 (CEST) Received: by wgez8 with SMTP id z8so108895340wge.0 for ; Mon, 01 Jun 2015 02:30:53 -0700 (PDT) In-Reply-To: <1432895688-1728-1-git-send-email-jblunck@infradead.org> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" In rte_log_dump_history() the log_history list is reinitialized without resetting the log_history_size. In the next call to rte_log_add_in_history() the log_history_size > RTE_LOG_HISTORY and the code unconditionally tries to remove the first entry: Program received signal SIGSEGV, Segmentation fault. rte_log_add_in_history ( buf=buf@entry=0x7f02035cd000 "DATAPLANE: 9:dp0s7 link RTM_NEWLINK [dp0s7] \nCAST,LOWER_UP>\n", size=size@entry=86) at /usr/src/packages/BUILD/lib/librte_eal/common/eal_common_log.c:122 Signed-off-by: Jan Blunck --- lib/librte_eal/common/eal_common_log.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/librte_eal/common/eal_common_log.c index fe3d7d5..39d6e3f 100644 --- a/lib/librte_eal/common/eal_common_log.c +++ b/lib/librte_eal/common/eal_common_log.c @@ -119,7 +119,10 @@ rte_log_add_in_history(const char *buf, size_t size) /* get a buffer for adding in history */ if (log_history_size > RTE_LOG_HISTORY) { hist_buf = STAILQ_FIRST(&log_history); - STAILQ_REMOVE_HEAD(&log_history, next); + if (hist_buf) { + STAILQ_REMOVE_HEAD(&log_history, next); + log_history_size--; + } } else { if (rte_mempool_mc_get(log_history_mp, &obj) < 0) @@ -234,6 +237,7 @@ rte_log_dump_history(FILE *out) rte_spinlock_lock(&log_list_lock); tmp_log_history = log_history; STAILQ_INIT(&log_history); + log_history_size = 0; rte_spinlock_unlock(&log_list_lock); for (i=0; i