From patchwork Fri Jul 18 14:14:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 33862 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f72.google.com (mail-oi0-f72.google.com [209.85.218.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 78A8320CA0 for ; Fri, 18 Jul 2014 14:14:49 +0000 (UTC) Received: by mail-oi0-f72.google.com with SMTP id a141sf6162433oig.11 for ; Fri, 18 Jul 2014 07:14:49 -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=6oTMsElr1+g0AlBd88maN2yWfLKiiOhKxOaLVUUzROg=; b=llvx7GdIgIjw5UKh3laRMou4d1Ap3IV7h1eP37IfFWmcexg45xkaj0tcK4uKgIilOF l9m8lC0gBbqfBKG0x3++9d2MTdrMyWR1RKVzJbT/AGoWWeSI/CsxHEFpZVUtsrJvqMDP eDJ+kwpfxF/4AxWhHBgWo5bJPqNHOWCzhVGI3pPs0x1lVC9buY+YmY/iS7gXERc+gbom RWdnn6UnY5w6sQqzUj4h7SN28ovofupvFBPUH2ai2CKPh86ahB5R0e4vJjOiww93K1yA n0qk6pmmgDfGsuQT02NIYXYC9mwL87kBsjZXoqo0am2AKZPchtaVpJ7AgftZCxklhsaF 0uVQ== X-Gm-Message-State: ALoCoQlPMkKz1haPi3SzQ4WaHGt0DRdGpCXfjgPx1FPWYxHqZoo2l/nHgRfT/rTV54+nFOSfDR9x X-Received: by 10.42.94.69 with SMTP id a5mr2713472icn.29.1405692889077; Fri, 18 Jul 2014 07:14:49 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.100.214 with SMTP id s80ls992980qge.99.gmail; Fri, 18 Jul 2014 07:14:48 -0700 (PDT) X-Received: by 10.53.1.231 with SMTP id bj7mr5104752vdd.49.1405692888742; Fri, 18 Jul 2014 07:14:48 -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 ee6si5807292vdb.81.2014.07.18.07.14.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 18 Jul 2014 07:14:48 -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 id10so2822135vcb.7 for ; Fri, 18 Jul 2014 07:14:48 -0700 (PDT) X-Received: by 10.52.244.81 with SMTP id xe17mr5362766vdc.24.1405692888635; Fri, 18 Jul 2014 07:14:48 -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 tc5csp14729vcb; Fri, 18 Jul 2014 07:14:48 -0700 (PDT) X-Received: by 10.70.62.97 with SMTP id x1mr5566429pdr.86.1405692885321; Fri, 18 Jul 2014 07:14:45 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y3si6089123pbw.183.2014.07.18.07.14.44; Fri, 18 Jul 2014 07:14:44 -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 S1422692AbaGROO1 (ORCPT + 25 others); Fri, 18 Jul 2014 10:14:27 -0400 Received: from mail-ie0-f175.google.com ([209.85.223.175]:64831 "EHLO mail-ie0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935096AbaGROOY (ORCPT ); Fri, 18 Jul 2014 10:14:24 -0400 Received: by mail-ie0-f175.google.com with SMTP id x19so4429550ier.6 for ; Fri, 18 Jul 2014 07:14:23 -0700 (PDT) X-Received: by 10.43.104.132 with SMTP id dm4mr8004544icc.56.1405692863631; Fri, 18 Jul 2014 07:14:23 -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 ga11sm6234171igd.8.2014.07.18.07.14.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Jul 2014 07:14:23 -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 v3 5/7] printk: honor LOG_PREFIX in msg_print_text() Date: Fri, 18 Jul 2014 09:14:17 -0500 Message-Id: <1405692859-32500-6-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1405692859-32500-1-git-send-email-elder@linaro.org> References: <1405692859-32500-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 b0e2934..a5c6427 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1006,11 +1006,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; - } do { const char *next = memchr(text, '\n', text_size);