From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 41682320A04 for ; Thu, 26 Mar 2026 22:18:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774563495; cv=none; b=r1YEByYNnFgiQ8ne4I0Ytn7rMEorMynsDQ5AnsY/CUUAQ2HLK+x0CFlLscKJiXkCKRIKU3wrtusTFva/mWXTJ1MptkVnpw4Mw8MiAOByURcaFXZplZp82EyXUXx4jFfKaj+J/n6gMGOpS0iri/AOoxdnSfE7ILtL3oNaot829AM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774563495; c=relaxed/simple; bh=qpFX/JTbGIwdSC3Z3k4i+PdijUgT1IlDDER/t+YpzgY=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fFi/d573ctUOSlsPxm1fLoce2K6lv6c74vkR8ZjnfCAyxh6ZTVBfhH1Rjx9P0Y7f5an9drPz0GFVbCYejQV00CuJ4Q8B/GOK6L7VAQtKAOpPa0Y9xKc4BfdHI3ICvx0lwWOI9ZMhdhuNlvNJqoU+5XIqCswso2Ra5PCWD6NHUbY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eMesgFlz; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eMesgFlz" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-486fb112c09so15001975e9.1 for ; Thu, 26 Mar 2026 15:18:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774563492; x=1775168292; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=1Nacxvr2ELo/XQwaZt97OI3oFNXHowVhMcBzyb+a0KA=; b=eMesgFlzRFNrh6qF8YWhQ9hkDLYv7gWgyBWEhVLiWJOLGGpYuTOVUlDzR4NXzywIMp 0AfARdlbT1RHFfMu2b88Bm0GUjshZKnCXz1rJ1uh+IRFsdCu31Wrl5CpWHCmGkU4SoBn E4frD3LZCFcUqs6mhCFQKekBvZEyTy4vMNFT/SdTc3zM6Joh0L4DUoC3y4TpvTXuUO1X j334/otE8uA+lXgk9iwgYy0l7Yd7nU4pUZbAUSoBeCw+7eV2sjftR+48YHmYPMKbhMI5 IgQWAuzZUGgB3A+tVb0R7hqkljRPk8I87I0XyVgZFkj++jHNb4LSy5rLZi5GDNkTcILy Tn4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774563492; x=1775168292; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=1Nacxvr2ELo/XQwaZt97OI3oFNXHowVhMcBzyb+a0KA=; b=oN3E3X1rTq6l3XFi90l9ZapWdEm4gDvOG0TVN/4Xwx7sIHRi0VXhsUBuveoJ5JoGmB qxjdzWsU7hO8Ovaub36KFRSSYbkBgUTiOWAQe4/aqCaJeLkMi7uvGC++Vv37+gZ6VeBm LfRYRBnh/gg+NJVBb5M1JfQPDKTAdENAOuYHfDu1mZV4gsk3BPn/+MdJrJJ4+sd8JGC4 XRrnl/nxMjPj0CInwZ0qfwhv5wptbXmmjSQBZreBXFj3bCI9MXO5sPrhLnw6PnFAwvfp NQdc+bPNxdsguxC3IcVRZ+4m2vy/LJpyZZSoHKlIVZG/5jX4yG6tyZljiMWJg8TBwH1k LbZQ== X-Forwarded-Encrypted: i=1; AJvYcCXTcyw2Je5mMdp2jP0sYKLt5u1ZPXCGXxOBukgEVih88Fu0mdQOHEKAryR25xkkSw22R0yRTW4di2yiGuo=@vger.kernel.org X-Gm-Message-State: AOJu0YzD3PNXHL+16z8VM7oCaanAjuMgw+4iNOzDBxScnJhDQbd8qTXD UTB+80gY195h/O7Slth7zuCE6PWXBvN7B61t1y+7KcW9JaTuYjoybbED X-Gm-Gg: ATEYQzyLuhzMaQvkAQAKkUDjOw4eYf0UcyFyeDdkouTOp0QoKk/m1rAtvNpDK4TA1Eq grlnaJUPWVFzbNj7SZO29BxBfWvigmIJsiluHNX/MGZssQ8hV4JcMIC6ik+n9eY7Pn8k75sKJPz fcF+efPPw67U2g43qzZyPJHFsdGitCyX2S5HaEthav1BCTecgWjlg+RyZlSYr1M8aumnVkJCQNG 4SJCl98nvetlLGVCPLBBnOB+PLL1k9w+uKgKyWPmxrU8KyCOu4TbHqaXpOUXfsHbNOCbKUirgnS 5Q0/jadSC/rGJsAl5Xx8mRTgN/D1WIQ4RtXnzPV0h8pJvp6qjLoyKTVMxtcFIBJqtuBSH6Ne5fL 0zVPBhgKAhsFzNkFGeDizbTQ7VBqM39QqC4z1qMTQHjC9zZNuunQmYG/vAZkhvYjdYem0dah9gt uQ9h02PDxE6JF4QkcrMFPjGLtl/JSGz3inmjS1Ss6i4XPX3d/hAb4awcNnxsbW0XGh X-Received: by 2002:a05:600c:5290:b0:486:fcdf:c065 with SMTP id 5b1f17b1804b1-4872808d317mr4858335e9.27.1774563492316; Thu, 26 Mar 2026 15:18:12 -0700 (PDT) Received: from pumpkin (82-69-66-36.dsl.in-addr.zen.co.uk. [82.69.66.36]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48722c78bc2sm55136515e9.5.2026.03.26.15.18.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 15:18:11 -0700 (PDT) Date: Thu, 26 Mar 2026 22:18:09 +0000 From: David Laight To: Pablo Neira Ayuso Cc: Florian Westphal , Phil Sutter , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Masami Hiramatsu , Petr Mladek , Rasmus Villemoes , Andy Shevchenko , Steven Rostedt , Sergey Senozhatsky , Andrew Morton Subject: Re: [PATCH next] netfilter: nf_conntrack_h323: Correct indentation when H323_TRACE defined Message-ID: <20260326221809.0b99df3f@pumpkin> In-Reply-To: References: <20260326201819.3900-1-david.laight.linux@gmail.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; arm-unknown-linux-gnueabihf) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Thu, 26 Mar 2026 21:24:39 +0100 Pablo Neira Ayuso wrote: > Hi David, > > On Thu, Mar 26, 2026 at 08:18:19PM +0000, david.laight.linux@gmail.com wrote: > > From: David Laight > > > > The trace lines are indented using PRINT("%*.s", xx, " "). > > Userspace will treat this as "%*.0s" and will output no characters > > when 'xx' is zero, the kernel treats it as "%*s" and will output > > a single ' ' - which is probably what is intended. > > > > Change all the formats to "%*s" removing the default precision. > > This gives a single space indent when level is zero. > > Do you have a setup using this helper? Or you just found this via > visual inspection? Found with grep looking for places which might be affected by 'fixing' the kernel printf code to be POSIX compliant. David > > > Signed-off-by: David Laight > > --- > > net/netfilter/nf_conntrack_h323_asn1.c | 38 +++++++++++++------------- > > 1 file changed, 19 insertions(+), 19 deletions(-) > > > > diff --git a/net/netfilter/nf_conntrack_h323_asn1.c b/net/netfilter/nf_conntrack_h323_asn1.c > > index 7b1497ed97d2..287402428975 100644 > > --- a/net/netfilter/nf_conntrack_h323_asn1.c > > +++ b/net/netfilter/nf_conntrack_h323_asn1.c > > @@ -276,7 +276,7 @@ static unsigned int get_uint(struct bitstr *bs, int b) > > static int decode_nul(struct bitstr *bs, const struct field_t *f, > > char *base, int level) > > { > > - PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); > > + PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name); > > > > return H323_ERROR_NONE; > > } > > @@ -284,7 +284,7 @@ static int decode_nul(struct bitstr *bs, const struct field_t *f, > > static int decode_bool(struct bitstr *bs, const struct field_t *f, > > char *base, int level) > > { > > - PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); > > + PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name); > > > > INC_BIT(bs); > > if (nf_h323_error_boundary(bs, 0, 0)) > > @@ -297,7 +297,7 @@ static int decode_oid(struct bitstr *bs, const struct field_t *f, > > { > > int len; > > > > - PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); > > + PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name); > > > > BYTE_ALIGN(bs); > > if (nf_h323_error_boundary(bs, 1, 0)) > > @@ -316,7 +316,7 @@ static int decode_int(struct bitstr *bs, const struct field_t *f, > > { > > unsigned int len; > > > > - PRINT("%*.s%s", level * TAB_SIZE, " ", f->name); > > + PRINT("%*s%s", level * TAB_SIZE, " ", f->name); > > > > switch (f->sz) { > > case BYTE: /* Range == 256 */ > > @@ -363,7 +363,7 @@ static int decode_int(struct bitstr *bs, const struct field_t *f, > > static int decode_enum(struct bitstr *bs, const struct field_t *f, > > char *base, int level) > > { > > - PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); > > + PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name); > > > > if ((f->attr & EXT) && get_bit(bs)) { > > INC_BITS(bs, 7); > > @@ -381,7 +381,7 @@ static int decode_bitstr(struct bitstr *bs, const struct field_t *f, > > { > > unsigned int len; > > > > - PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); > > + PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name); > > > > BYTE_ALIGN(bs); > > switch (f->sz) { > > @@ -417,7 +417,7 @@ static int decode_numstr(struct bitstr *bs, const struct field_t *f, > > { > > unsigned int len; > > > > - PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); > > + PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name); > > > > /* 2 <= Range <= 255 */ > > if (nf_h323_error_boundary(bs, 0, f->sz)) > > @@ -437,7 +437,7 @@ static int decode_octstr(struct bitstr *bs, const struct field_t *f, > > { > > unsigned int len; > > > > - PRINT("%*.s%s", level * TAB_SIZE, " ", f->name); > > + PRINT("%*s%s", level * TAB_SIZE, " ", f->name); > > > > switch (f->sz) { > > case FIXD: /* Range == 1 */ > > @@ -490,7 +490,7 @@ static int decode_bmpstr(struct bitstr *bs, const struct field_t *f, > > { > > unsigned int len; > > > > - PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); > > + PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name); > > > > switch (f->sz) { > > case BYTE: /* Range == 256 */ > > @@ -522,7 +522,7 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f, > > const struct field_t *son; > > unsigned char *beg = NULL; > > > > - PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); > > + PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name); > > > > /* Decode? */ > > base = (base && (f->attr & DECODE)) ? base + f->offset : NULL; > > @@ -544,7 +544,7 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f, > > /* Decode the root components */ > > for (i = opt = 0, son = f->fields; i < f->lb; i++, son++) { > > if (son->attr & STOP) { > > - PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ", > > + PRINT("%*s%s\n", (level + 1) * TAB_SIZE, " ", > > son->name); > > return H323_ERROR_STOP; > > } > > @@ -562,7 +562,7 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f, > > if (nf_h323_error_boundary(bs, len, 0)) > > return H323_ERROR_BOUND; > > if (!base || !(son->attr & DECODE)) { > > - PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, > > + PRINT("%*s%s\n", (level + 1) * TAB_SIZE, > > " ", son->name); > > bs->cur += len; > > continue; > > @@ -615,7 +615,7 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f, > > } > > > > if (son->attr & STOP) { > > - PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ", > > + PRINT("%*s%s\n", (level + 1) * TAB_SIZE, " ", > > son->name); > > return H323_ERROR_STOP; > > } > > @@ -629,7 +629,7 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f, > > if (nf_h323_error_boundary(bs, len, 0)) > > return H323_ERROR_BOUND; > > if (!base || !(son->attr & DECODE)) { > > - PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ", > > + PRINT("%*s%s\n", (level + 1) * TAB_SIZE, " ", > > son->name); > > bs->cur += len; > > continue; > > @@ -655,7 +655,7 @@ static int decode_seqof(struct bitstr *bs, const struct field_t *f, > > const struct field_t *son; > > unsigned char *beg = NULL; > > > > - PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); > > + PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name); > > > > /* Decode? */ > > base = (base && (f->attr & DECODE)) ? base + f->offset : NULL; > > @@ -710,7 +710,7 @@ static int decode_seqof(struct bitstr *bs, const struct field_t *f, > > if (nf_h323_error_boundary(bs, len, 0)) > > return H323_ERROR_BOUND; > > if (!base || !(son->attr & DECODE)) { > > - PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, > > + PRINT("%*s%s\n", (level + 1) * TAB_SIZE, > > " ", son->name); > > bs->cur += len; > > continue; > > @@ -751,7 +751,7 @@ static int decode_choice(struct bitstr *bs, const struct field_t *f, > > const struct field_t *son; > > unsigned char *beg = NULL; > > > > - PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); > > + PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name); > > > > /* Decode? */ > > base = (base && (f->attr & DECODE)) ? base + f->offset : NULL; > > @@ -792,7 +792,7 @@ static int decode_choice(struct bitstr *bs, const struct field_t *f, > > /* Transfer to son level */ > > son = &f->fields[type]; > > if (son->attr & STOP) { > > - PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ", son->name); > > + PRINT("%*s%s\n", (level + 1) * TAB_SIZE, " ", son->name); > > return H323_ERROR_STOP; > > } > > > > @@ -804,7 +804,7 @@ static int decode_choice(struct bitstr *bs, const struct field_t *f, > > if (nf_h323_error_boundary(bs, len, 0)) > > return H323_ERROR_BOUND; > > if (!base || !(son->attr & DECODE)) { > > - PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ", > > + PRINT("%*s%s\n", (level + 1) * TAB_SIZE, " ", > > son->name); > > bs->cur += len; > > return H323_ERROR_NONE; > > -- > > 2.39.5 > >