From patchwork Mon Feb 17 13:46:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrea Claudi X-Patchwork-Id: 1239252 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=WeK5Gi1J; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48Lldl12qsz9sRJ for ; Tue, 18 Feb 2020 00:46:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728111AbgBQNqt (ORCPT ); Mon, 17 Feb 2020 08:46:49 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:29757 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726977AbgBQNqt (ORCPT ); Mon, 17 Feb 2020 08:46:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581947207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d3J45i/iFgFhqXdb8PdNOHV/vscLYNA2Zd6HEo5Tg2c=; b=WeK5Gi1JbMR0wttDfv04blN1jZPr5ooQjMpwqEZb+OOAOyRj9TvPO5re8VGLW9Ry36n5Wt ZSesb/yOclma9fw4oYhxxC5tcAcjy0vwptqofWECTw9e1YjqptZet8KORXAtzzmCIbjMg8 AMVdfAWWAjtaeuFTuy+9QR2Cc8zCgdc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-438-EQ-6DH7QOAy0OPX2wGflXw-1; Mon, 17 Feb 2020 08:46:46 -0500 X-MC-Unique: EQ-6DH7QOAy0OPX2wGflXw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3886F100550E; Mon, 17 Feb 2020 13:46:45 +0000 (UTC) Received: from renaissance-vector.mxp.redhat.com (unknown [10.32.181.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5ECE019757; Mon, 17 Feb 2020 13:46:44 +0000 (UTC) From: Andrea Claudi To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, dsahern@gmail.com Subject: [PATCH iproute2 v2] nstat: print useful error messages in abort() cases Date: Mon, 17 Feb 2020 14:46:18 +0100 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When nstat temporary file is corrupted or in some other corner cases, nstat use abort() to stop its execution. This can puzzle some users, wondering what is the reason for the crash. This commit replaces abort() with some meaningful error messages and exit() Reported-by: Renaud Métrich Signed-off-by: Andrea Claudi --- v2: replace two missing abort(), resend to iproute2 instead of iproute2-next misc/nstat.c | 47 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/misc/nstat.c b/misc/nstat.c index 23113b223b22d..425e75ef461ec 100644 --- a/misc/nstat.c +++ b/misc/nstat.c @@ -142,14 +142,19 @@ static void load_good_table(FILE *fp) } /* idbuf is as big as buf, so this is safe */ nr = sscanf(buf, "%s%llu%lg", idbuf, &val, &rate); - if (nr < 2) - abort(); + if (nr < 2) { + fprintf(stderr, "%s:%d: error parsing history file\n", + __FILE__, __LINE__); + exit(-2); + } if (nr < 3) rate = 0; if (useless_number(idbuf)) continue; - if ((n = malloc(sizeof(*n))) == NULL) - abort(); + if ((n = malloc(sizeof(*n))) == NULL) { + perror("nstat: malloc"); + exit(-1); + } n->id = strdup(idbuf); n->val = val; n->rate = rate; @@ -190,8 +195,11 @@ static void load_ugly_table(FILE *fp) int count1, count2, skip = 0; p = strchr(buf, ':'); - if (!p) - abort(); + if (!p) { + fprintf(stderr, "%s:%d: error parsing history file\n", + __FILE__, __LINE__); + exit(-2); + } count1 = count_spaces(buf); *p = 0; idbuf[0] = 0; @@ -211,8 +219,10 @@ static void load_ugly_table(FILE *fp) strncat(idbuf, p, sizeof(idbuf) - off - 1); } n = malloc(sizeof(*n)); - if (!n) - abort(); + if (!n) { + perror("nstat: malloc"); + exit(-1); + } n->id = strdup(idbuf); n->rate = 0; n->next = db; @@ -221,18 +231,27 @@ static void load_ugly_table(FILE *fp) } n = db; nread = getline(&buf, &buflen, fp); - if (nread == -1) - abort(); + if (nread == -1) { + fprintf(stderr, "%s:%d: error parsing history file\n", + __FILE__, __LINE__); + exit(-2); + } count2 = count_spaces(buf); if (count2 > count1) skip = count2 - count1; do { p = strrchr(buf, ' '); - if (!p) - abort(); + if (!p) { + fprintf(stderr, "%s:%d: error parsing history file\n", + __FILE__, __LINE__); + exit(-2); + } *p = 0; - if (sscanf(p+1, "%llu", &n->val) != 1) - abort(); + if (sscanf(p+1, "%llu", &n->val) != 1) { + fprintf(stderr, "%s:%d: error parsing history file\n", + __FILE__, __LINE__); + exit(-2); + } /* Trick to skip "dummy" trailing ICMP MIB in 2.4 */ if (skip) skip--;