From patchwork Tue Jul 22 12:13:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 34087 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9D27320672 for ; Tue, 22 Jul 2014 12:14:24 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id eb12sf49199699oac.5 for ; Tue, 22 Jul 2014 05:14:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=SwuR0Ih2T33sOrdvRCYk7E4zj/GXxK8Z/XnGFm2u2hI=; b=i3aTBlLzSoSvFC63T/Ek0p3GjzKq0javk4cZnHeBBbr8nSOC5QzC+KKFoRi3VkpeTb Gn0Vgy6BjB12sG8K91VHKK9N8jE5A8POnjIOVaH4BOM5lFmhVLy0Boa5IUeAckIPjZ1k bRzcI23D+hfx2SexSQIAKUZE6BtnIXb/pb8KA5p17LyDvqESdAvCU9gXjkm8mjJwB7DM H56Ex1yhZ2nE0G3mX+mUjetWJNT/oXk2qnyPhPuFsa6rLQEZKDerIX26nstzQHEmbf0b pWNCQuxbJAqHKHitZzp9nSWm2BNV/LmzQzVYmzD+ZgjgM4gg/gkR6gYZo9DrILGpSGYa cY6A== X-Gm-Message-State: ALoCoQkBUcEjCxQp30/Epb4PV2XDIZWY5zv3zxj9PPEAp2HFTFXao4Tm3wjLzVcJZVR/C6SJIuP2 X-Received: by 10.50.80.111 with SMTP id q15mr4928944igx.0.1406031263928; Tue, 22 Jul 2014 05:14:23 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.102.246 with SMTP id w109ls1596945qge.4.gmail; Tue, 22 Jul 2014 05:14:23 -0700 (PDT) X-Received: by 10.52.106.162 with SMTP id gv2mr33303088vdb.47.1406031263778; Tue, 22 Jul 2014 05:14:23 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id cl2si314263vcb.98.2014.07.22.05.14.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Jul 2014 05:14:23 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id id10so9914144vcb.35 for ; Tue, 22 Jul 2014 05:14:23 -0700 (PDT) X-Received: by 10.221.34.13 with SMTP id sq13mr39651128vcb.16.1406031263596; Tue, 22 Jul 2014 05:14:23 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp190750vcb; Tue, 22 Jul 2014 05:14:23 -0700 (PDT) X-Received: by 10.70.33.102 with SMTP id q6mr737899pdi.39.1406031262486; Tue, 22 Jul 2014 05:14:22 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id do1si135651pdb.111.2014.07.22.05.14.21 for ; Tue, 22 Jul 2014 05:14:21 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755488AbaGVMOP (ORCPT + 12 others); Tue, 22 Jul 2014 08:14:15 -0400 Received: from mail-ig0-f176.google.com ([209.85.213.176]:36620 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755332AbaGVMNx (ORCPT ); Tue, 22 Jul 2014 08:13:53 -0400 Received: by mail-ig0-f176.google.com with SMTP id hn18so3924306igb.15 for ; Tue, 22 Jul 2014 05:13:52 -0700 (PDT) X-Received: by 10.42.12.6 with SMTP id w6mr22468722icw.69.1406031232510; Tue, 22 Jul 2014 05:13:52 -0700 (PDT) Received: from localhost.localdomain (c-24-245-18-91.hsd1.mn.comcast.net. [24.245.18.91]) by mx.google.com with ESMTPSA id tp4sm21112991igb.9.2014.07.22.05.13.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Jul 2014 05:13:52 -0700 (PDT) From: Alex Elder To: akpm@linux-foundation.org Cc: kay@vrfy.org, pmladek@suse.cz, bp@suse.de, john.stultz@linaro.org, jack@suse.cz, linux-kernel@vger.kernel.org Subject: [PATCH v6 6/7] printk: honor LOG_PREFIX in msg_print_text() Date: Tue, 22 Jul 2014 07:13:49 -0500 Message-Id: <1406031230-18107-7-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1406031230-18107-1-git-send-email-elder@linaro.org> References: <1406031230-18107-1-git-send-email-elder@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: elder@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch fixes a problem similar to what was addressed in the previous patch. All paths that read and format log records (for consoles, and for reading via syslog and /dev/kmsg) go through msg_print_text(). That function starts with some logic to determine whether the given log record when formatted should begin with a "prefix" string, and whether it should end with a newline. That logic has a bug. The LOG_PREFIX flag in a log record indicates that when it's formatted, a log record should include a prefix. This is used to force a record to begin a new line--even if its preceding log record contained LOG_CONT (indicating its content should be combined with the next record). Like the previous patch, the problem occurs when these flags are all set: prev & LOG_CONT msg->flags & LOG_PREFIX msg->flags & LOG_CONT In that case, "prefix" should be true but it is not. The fix involves checking LOG_PREFIX when a message has its LOG_CONT flag set, and in that case allowing "prefix" to become false only if LOG_PREFIX is not set. I.e., the logic for "prefix" would become: if (prev & LOG_CONT && !(msg->flags & LOG_PREFIX)) prefix = false; if (msg->flags & LOG_CONT) if (prev & LOG_CONT && !(msg->flags & LOG_PREFIX)) prefix = false; However, note that this makes the (msg->flags & LOG_CONT) block redunant--it's handled by the test just above it. The result becomes quite a bit simpler than before. The following table concisely defines the problem: prev | msg | msg || CONT |PREFIX| CONT ||prefix ------+------+------++------ clear| clear| clear|| true clear| clear| set || true clear| set | clear|| true clear| set | set || true set | clear| clear|| false set | clear| set || false set | set | clear|| true set | set | set || false <-- should be true Signed-off-by: Alex Elder Reviewed-by: Petr Mládek --- kernel/printk/printk.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 25b7527..b630c85 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1010,11 +1010,8 @@ static size_t msg_print_text(const struct printk_log *msg, enum log_flags prev, if ((prev & LOG_CONT) && !(msg->flags & LOG_PREFIX)) prefix = false; - if (msg->flags & LOG_CONT) { - if (prev & LOG_CONT) - prefix = false; + if (msg->flags & LOG_CONT) newline = false; - } if ((prev & LOG_CONT) && (msg->flags & LOG_PREFIX) && len < size) { if (buf)