From nobody Thu Dec 30 07:09:01 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8EAB119122EE; Thu, 30 Dec 2021 07:09:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JPfWx2JSBz3w57; Thu, 30 Dec 2021 07:09:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2B8F01461E; Thu, 30 Dec 2021 07:09:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BU791Md032377; Thu, 30 Dec 2021 07:09:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BU791q0032376; Thu, 30 Dec 2021 07:09:01 GMT (envelope-from git) Date: Thu, 30 Dec 2021 07:09:01 GMT Message-Id: <202112300709.1BU791q0032376@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: dcb724b5a7d9 - main - ktrdump: properly parse %% in the format string List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcb724b5a7d97a7b63566ba0ee48265eb743a94e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640848141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=apnGWD5yEcrvDHRKjYPBvfNpcbw3OHFUllR+ohiImqI=; b=s1NDkAQhO0oLSqoWdZWl7e6Z/e9zlje5EPJvBrUbOnSnkPil0OZ488CN2fxJRZZcviaRS5 G58MEQwCISpbm2dIi5SW7vx60nk8ZGg9zL5zk6uqXjP3Q5kWaWDFxvAUq8SdQl+a7eA6om v/ICf4SA1UKtts4J3G5Ne5Anb4rnGa9rLYkBaBVMWcyrBJY54662L+FbflYKxgy0eWpmJY A0EUH98JQpIwhMy/q0/vADFv3KPOpcYmvQ2niPRmLunDi54xJqjU0hUkIGXMY+bedFsu8k iyLjSpOITPQ0WzwuQw81Tjfi2chEHNEc5Y9e9Celj9d3i0P1et3yHqWZpb79/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640848141; a=rsa-sha256; cv=none; b=VlI8v/y/dSdE//kCNwDeigOhMzthmT1vykxeQK6BFda2JLqMz7JKI+jKWfvNNrC6D1nAyF covVbzWfQUvtFE4fosIInaJVEQPhTEJLcI4Ff/n8jgAQWyOOwIk+XVLrVaRumpblsl/ihy VjueZ96U8FQPGzcXl35Lu2SyC4rnipnhR42MfQm57dwwILI4wFlAVb1+/aUelGp4Iwanxc +sHSYoeIp8s2oMhsR0SOSA1+VpOwEugT1G2vy5TwLKpYBhH8xHvZZB8YaoIYsKkb1tKvft FBZLrwRoDYe1wLHb6kgwKaJFYWEccQjofw9UI43IKwfaGj48R7QvgLbrLil1/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=dcb724b5a7d97a7b63566ba0ee48265eb743a94e commit dcb724b5a7d97a7b63566ba0ee48265eb743a94e Author: Gleb Smirnoff AuthorDate: 2021-12-30 07:08:15 +0000 Commit: Gleb Smirnoff CommitDate: 2021-12-30 07:08:15 +0000 ktrdump: properly parse %% in the format string Discovered by: 27ca37acb7c25 --- usr.bin/ktrdump/ktrdump.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/ktrdump/ktrdump.c b/usr.bin/ktrdump/ktrdump.c index bbe8fb19aae9..82ff0ebdf8d7 100644 --- a/usr.bin/ktrdump/ktrdump.c +++ b/usr.bin/ktrdump/ktrdump.c @@ -298,6 +298,8 @@ dump_entries: continue; next: if ((c = *p++) == '\0') break; + if (c == '%') + continue; if (parm == KTR_PARMS) errx(1, "too many parameters in \"%s\"", desc); switch (c) {