Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp873444ybe; Wed, 4 Sep 2019 09:01:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqwNN2T85en33bXx7Ti28EEtjNJC5DjURqFQEDI4jKCtUTkRH84H4pPCqWVJcOLWc6Q4tr+S X-Received: by 2002:a17:90a:80ca:: with SMTP id k10mr5878118pjw.59.1567612874424; Wed, 04 Sep 2019 09:01:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567612874; cv=none; d=google.com; s=arc-20160816; b=lI1W2u1jOheeZbHlfL6sHqcy+RbRv0TGtkogD6HPi2ruHTlJiFYAFypmaiGPaXW+7J E5C57xdQIESJqvjMRGyiQztF62KegiTSgpTfTwR4yB3TVr4iRkC1AlFl8Rw5Z6oEP8s3 oBmMkSpMSB5/YJ22etU07o6Zbf8j3u4frdwtxyM+BVA13/o8GX4kp3Jr8GX8b4Sb4MET uYAYzsb8J6x7tTL3gGud3rer07FjELvEHSJC80xBnIv/yx6Bd2Hw6BwTTGNsRvfYR8Yg omI+XUKvbT3TY4/9JBWo7BcOP/jYodpQ0ur2QA+0RWzZpLWJ/suGsrRAc6ATf6m4V66V ec5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1x+I1uikBc5VzoLuAoQpKranE11DlxVzYoLB0PzhO7U=; b=j1lCyAZtxk6TQzcxCDpfP8F04EbIkvbeqFzt8NgDctuPW/6kgk1j2wZ8xK+QclK0FF r4g9xfReJk4hvzuV+qWeksDesrnfuoEgoRRSVCr5bZBrh1DxRuVsXVTBXRS0/Hi63sRv obuiUVIsKtvtdqXXuDN4IIXYmV17vJ/U0lFnx6omhvDjBh/mlsCnJBLdhWG2BguUlFI0 HD2Dcp2w1dwUX9mpQ9bwEo0rAF+5dLERhJkaepmfqooy0ehlk3LV5dmMt26p8qTWXxqZ k19z7qBji22K04h5GvmKp8DstqpNVYEBNSKAOgwxt2HPcNpFpD7HBhOyTwbKimTAXghm Cs0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=y4B6BFWF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x126si17925060pgx.356.2019.09.04.09.00.59; Wed, 04 Sep 2019 09:01:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=y4B6BFWF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732220AbfIDP7B (ORCPT + 99 others); Wed, 4 Sep 2019 11:59:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:33214 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732190AbfIDP7A (ORCPT ); Wed, 4 Sep 2019 11:59:00 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3197523784; Wed, 4 Sep 2019 15:58:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567612739; bh=csKgyx9cIvcyBdEkZTLKA3ImSwmlRCwcW6veHW3zcEA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y4B6BFWFtijfVWzLcd+0hXzrwGuPk2MErLJtYiAZQUnPX0lwIXmcsW+it98YWuQOV Ka3OJ7Pj12TSGwbrF58nBwfpc2bWZBPOooz7AvUvi8zub3FSAKbRb/gIUn7NN+VQeG 17J1nlRotRBs822reo9bD7U6j5T0oMRsDQCaonRc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thomas Jarosch , Pablo Neira Ayuso , Sasha Levin , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 52/94] netfilter: nf_conntrack_ftp: Fix debug output Date: Wed, 4 Sep 2019 11:56:57 -0400 Message-Id: <20190904155739.2816-52-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904155739.2816-1-sashal@kernel.org> References: <20190904155739.2816-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Jarosch [ Upstream commit 3a069024d371125227de3ac8fa74223fcf473520 ] The find_pattern() debug output was printing the 'skip' character. This can be a NULL-byte and messes up further pr_debug() output. Output without the fix: kernel: nf_conntrack_ftp: Pattern matches! kernel: nf_conntrack_ftp: Skipped up to `<7>nf_conntrack_ftp: find_pattern `PORT': dlen = 8 kernel: nf_conntrack_ftp: find_pattern `EPRT': dlen = 8 Output with the fix: kernel: nf_conntrack_ftp: Pattern matches! kernel: nf_conntrack_ftp: Skipped up to 0x0 delimiter! kernel: nf_conntrack_ftp: Match succeeded! kernel: nf_conntrack_ftp: conntrack_ftp: match `172,17,0,100,200,207' (20 bytes at 4150681645) kernel: nf_conntrack_ftp: find_pattern `PORT': dlen = 8 Signed-off-by: Thomas Jarosch Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_conntrack_ftp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c index 8c6c11bab5b67..b5df6c4c159cd 100644 --- a/net/netfilter/nf_conntrack_ftp.c +++ b/net/netfilter/nf_conntrack_ftp.c @@ -322,7 +322,7 @@ static int find_pattern(const char *data, size_t dlen, i++; } - pr_debug("Skipped up to `%c'!\n", skip); + pr_debug("Skipped up to 0x%hhx delimiter!\n", skip); *numoff = i; *numlen = getnum(data + i, dlen - i, cmd, term, numoff); -- 2.20.1