From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754885AbcBCMNE (ORCPT ); Wed, 3 Feb 2016 07:13:04 -0500 Received: from frisell.zx2c4.com ([192.95.5.64]:57807 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752302AbcBCMNC (ORCPT ); Wed, 3 Feb 2016 07:13:02 -0500 From: "Jason A. Donenfeld" To: akpm@linux-foundation.org, linux@rasmusvillemoes.dk, andriy.shevchenko@linux.intel.com, linux-kernel@vger.kernel.org, dborkman@redhat.com Cc: "Jason A. Donenfeld" Subject: [PATCH] vsprintf: flowinfo in IPv6 is optional too Date: Wed, 3 Feb 2016 13:13:21 +0100 Message-Id: <1454501601-28480-1-git-send-email-Jason@zx2c4.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454496118-26370-1-git-send-email-Jason@zx2c4.com> References: <1454496118-26370-1-git-send-email-Jason@zx2c4.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Jason A. Donenfeld --- lib/vsprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 1b1b1c8..85e6645 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1189,7 +1189,7 @@ char *ip6_addr_string_sa(char *buf, char *end, const struct sockaddr_in6 *sa, *p++ = ':'; p = number(p, pend, ntohs(sa->sin6_port), spec); } - if (have_f) { + if (have_f && (sa->sin6_flowinfo & IPV6_FLOWINFO_MASK)) { *p++ = '/'; p = number(p, pend, ntohl(sa->sin6_flowinfo & IPV6_FLOWINFO_MASK), spec); -- 2.7.0