From patchwork Fri Oct 13 13:57:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 825483 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZlmdizYq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yD8Rt4dz2z9sPr for ; Sat, 14 Oct 2017 00:57:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758201AbdJMN5n (ORCPT ); Fri, 13 Oct 2017 09:57:43 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:33943 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753374AbdJMN5l (ORCPT ); Fri, 13 Oct 2017 09:57:41 -0400 Received: by mail-wr0-f193.google.com with SMTP id l1so991927wrc.1 for ; Fri, 13 Oct 2017 06:57:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ruh361DvWDl2PD+VntnYojI2GI1GF2q/bwokSAqk+6g=; b=ZlmdizYqxOI68E9JcgYXjqJbRPiNGjv40RlLm7sz9z6W5GU16f5ESM0qQXcRa9HnLv mHBTvYpZmkssSxXEX1HwvW7WhTnMZVG+4VN/ZBxluYEkspgqgck0T+AUibCCKyijGHFm V8Kk0L6obFCV4MiZL+XfwCxlaijmtaVQ5MYcPyKQdqeQ6hBX7fSfdAwjJwCXCEYgCtMJ KWqQjcdz3nigZmyYQJ20oPpzPyPndcg0svRQID6oa4hL4gsVJSNu7HRfUhfsgNoRxh9A CaU+Xs4M9gE+kVQYvz5z2OzOKRx/lKdUZmeCc8YFeOEc745u7Jk0hZLDmF/RtHevSmCJ olQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ruh361DvWDl2PD+VntnYojI2GI1GF2q/bwokSAqk+6g=; b=MsClRz3eO6WFEqaGzhYPbd8pL37g12cLBXNyRZVGXumTKYatpX30xYwuvvccKqjZ4z jitaz/kjRbSTOPhy0gBtaBbRv7mUwC7V/Qb1LGgM/+jGU5g0wzrUdDAOpttlQEyDbOpB ocU7V9LRxGEW7/PXswpzM8F+PsSnTeLcAC1F6UhiZANmh6YcQlsrUk7tEUCMdfnBQxu0 SiKaswPW0ilR2X2sRaF2UgdmeAczZtaa8YpDtSH0Ax3WocyX5lLorkiEvhm7UFot1nB2 Z+6rNWU/NELrUu70DcAqoaGGtjHsSHTRf+V4Jq+nY0W+S3uaZH5eH4TUgeVn5jJg4POS XxfA== X-Gm-Message-State: AMCzsaVBIBMRo8OnE6fTggh+flhXYuQWlWkb8XtbRb8Lmk5O7mfJ0Lmf 9vlZJOtOTgGzrjfnRKGY9XmDnQ== X-Google-Smtp-Source: AOwi7QAMU7QmVHHelhMbuhsjrTohkGj1Y+IvZFDdtJZksFd626iFdAw4uT0p9wqNYzjBSq92O11x8w== X-Received: by 10.223.134.157 with SMTP id 29mr1430265wrx.72.1507903060122; Fri, 13 Oct 2017 06:57:40 -0700 (PDT) Received: from localhost.localdomain ([85.119.94.113]) by smtp.gmail.com with ESMTPSA id q16sm1414348wrg.96.2017.10.13.06.57.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Oct 2017 06:57:39 -0700 (PDT) From: Petr Vorel To: netdev@vger.kernel.org Cc: Petr Vorel , Julien Fortin , Stephen Hemminger Subject: [PATCH iproute2 v2 2/4] color: Fix another ip segfault when using --color switch Date: Fri, 13 Oct 2017 15:57:17 +0200 Message-Id: <20171013135719.18450-3-petr.vorel@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171013135719.18450-1-petr.vorel@gmail.com> References: <20171013135719.18450-1-petr.vorel@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 959f1428 ("color: add new COLOR_NONE and disable_color function") introducing color enum COLOR_NONE, which is not only duplicite of COLOR_CLEAR, but also caused segfault, when running ip with --color switch, as 'attr + 8' in color_fprintf() access array item out of bounds. Thus removing it and restoring "magic" offset + 7. Reproduce with: $ ip -c a Signed-off-by: Petr Vorel --- include/color.h | 1 - lib/color.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/color.h b/include/color.h index 1cd6f7d2..c183ef79 100644 --- a/include/color.h +++ b/include/color.h @@ -2,7 +2,6 @@ #define __COLOR_H__ 1 enum color_attr { - COLOR_NONE, COLOR_IFNAME, COLOR_MAC, COLOR_INET, diff --git a/lib/color.c b/lib/color.c index 79d5e289..05afcb21 100644 --- a/lib/color.c +++ b/lib/color.c @@ -104,13 +104,13 @@ int color_fprintf(FILE *fp, enum color_attr attr, const char *fmt, ...) va_start(args, fmt); - if (!color_is_enabled || attr == COLOR_NONE) { + if (!color_is_enabled || attr == COLOR_CLEAR) { ret = vfprintf(fp, fmt, args); goto end; } ret += fprintf(fp, "%s", - color_codes[attr_colors[is_dark_bg ? attr + 8 : attr]]); + color_codes[attr_colors[is_dark_bg ? attr + 7 : attr]]); ret += vfprintf(fp, fmt, args); ret += fprintf(fp, "%s", color_codes[C_CLEAR]);