Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2829718pxv; Mon, 12 Jul 2021 03:00:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx56A8X6QiVnL9fAf4nY/Cadm4M16wu0tbmZcQ+mxR/tP+HTY4eI9ZA2EbpeHMEgVjaWo/d X-Received: by 2002:a6b:f81a:: with SMTP id o26mr40049850ioh.68.1626084011385; Mon, 12 Jul 2021 03:00:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626084011; cv=none; d=google.com; s=arc-20160816; b=mz/gG5JYjyd8s+D1WWdbeUQM/12UZeZXExguTOkP7mI60Rpeey7yt2jzcz1h3UjI1/ rdBDTAOUr0vT2SYXYCJfkqwqMN60koAah0xyk+4FUH/Y5Uk7AwWz0Mx1NKo3Qm6gjYLx Zg9g0gGKD61C7F66PK/E8jWWZwn13sS9tFonQjGHlg0j3/+sgPzHo1d28k4cqA85pxBv m9wk3ybtX6SxndeChlR/0tsN9qsCDDimR7cxM49TmZ56/qipjzGzV44iihoZpfXqiwCD Jv8yAm6jdpf5/lny+BjeeuL3mOxo7kiCTLNWUe867mD78u3AF00C14AtD7C2iRkLXP3S LwQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=sAgAY6s+kDv1YU9VmYZmu0wwhfYeMdVaqDFve21Ym8A=; b=o9YRhFMeaXbi8M84eDtRj8VrQokfN9ojqWfIedqUHcnRZmJaRp7iw9wK2Vs46eCieY aQbaXfYtKQj8vvl04cWxHBdnwLdywtQXivlUwAxYpODAAJsGpkKlfmDanz7b8WtMx0oR zhzbgc/rapj82cmQ8TJXa90Gc8C4dqZ7tNB/5oS0MFgbUycPx08BT2YHGURnglxh03sT gjWql8vPc5evT5pMXqLSF5bCpr9u/sJ22NrLtFpOksaQ8oWA79ReKV02WpD35H5JZF4U gVOOT2tR8WLpJ1CR66YsMORJMB/FXWMy4TcE72/2ENEMbLNeqzhQc0DceavjqoL/3qVN oA/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=eM3tzfpt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x19si16333266ioa.74.2021.07.12.02.59.58; Mon, 12 Jul 2021 03:00:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=eM3tzfpt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243977AbhGLHKK (ORCPT + 99 others); Mon, 12 Jul 2021 03:10:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:45554 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237116AbhGLGr6 (ORCPT ); Mon, 12 Jul 2021 02:47:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E1EA7610E5; Mon, 12 Jul 2021 06:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072229; bh=SqgqjwXJJX6J2I5vegfmJ0u8E68kgN5L3j4QWGbwvZY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eM3tzfpt9GeOnNPnsKoBCD+mUCSZdKd9Z8wfGDrzfXeS6ERBNmyV681YpbE4hF6xU ieJnu1FhTOKMKPpmsfxJK6+Gp15oqxe6i+sE4S91fQHvr2H+rFpmUq9Jma5qGYagp2 sEHaEZ2XYUeWDgMlpkQpkoQBCg3VmS3vuslXsOy4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Martin Loviska , Gary Lin , Daniel Borkmann , Dmitrii Banshchikov , Sasha Levin Subject: [PATCH 5.10 409/593] bpfilter: Specify the log level for the kmsg message Date: Mon, 12 Jul 2021 08:09:29 +0200 Message-Id: <20210712060932.838154822@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gary Lin [ Upstream commit a196fa78a26571359740f701cf30d774eb8a72cb ] Per the kmsg document [0], if we don't specify the log level with a prefix "" in the message string, the default log level will be applied to the message. Since the default level could be warning(4), this would make the log utility such as journalctl treat the message, "Started bpfilter", as a warning. To avoid confusion, this commit adds the prefix "<5>" to make the message always a notice. [0] https://www.kernel.org/doc/Documentation/ABI/testing/dev-kmsg Fixes: 36c4357c63f3 ("net: bpfilter: print umh messages to /dev/kmsg") Reported-by: Martin Loviska Signed-off-by: Gary Lin Signed-off-by: Daniel Borkmann Acked-by: Dmitrii Banshchikov Link: https://lore.kernel.org/bpf/20210623040918.8683-1-glin@suse.com Signed-off-by: Sasha Levin --- net/bpfilter/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bpfilter/main.c b/net/bpfilter/main.c index 05e1cfc1e5cd..291a92546246 100644 --- a/net/bpfilter/main.c +++ b/net/bpfilter/main.c @@ -57,7 +57,7 @@ int main(void) { debug_f = fopen("/dev/kmsg", "w"); setvbuf(debug_f, 0, _IOLBF, 0); - fprintf(debug_f, "Started bpfilter\n"); + fprintf(debug_f, "<5>Started bpfilter\n"); loop(); fclose(debug_f); return 0; -- 2.30.2