From patchwork Mon Jul 28 13:29:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 34370 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f72.google.com (mail-qg0-f72.google.com [209.85.192.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E8D5A20AE8 for ; Mon, 28 Jul 2014 13:31:45 +0000 (UTC) Received: by mail-qg0-f72.google.com with SMTP id q107sf16107967qgd.7 for ; Mon, 28 Jul 2014 06:31:45 -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=BEVAIFQ7j/aMB4DoAZnvMNeVkSx7s4k+GWDBIemoXjA=; b=LfzTCeqSBvM2rio41D6R7HXBG4ezOW5wICKwoWkXzEaGOvRhNAKTsMEgKE42ClsMEY sGc82cCOdu46QHCx/c7BJ01eQqJI4YQA6nTWQWkM8bs9LF/pttUaoeoYN7CFwHwAZlKg OXfaBwqiN3KcRLzwcchqtJIQrnOPRW+c1tnb0Vq0TXpeBfLnArpXNZkDul8gFyE7bF0f +7M6Tu4XaJL0YaQf/MDJ7lt8UttvAJ0N/4xu3Cbphv6pn4DIjpb9x4DVh6Rh6sgzHaPL JXVM/ulcsZpyPMhxbLW+tvpJbHfJ79Xd/rWpFkyU7+FyW4tJnxf59g3QFPW/NGHMFWyj KL/A== X-Gm-Message-State: ALoCoQmMdE5yhzHt+kWpZrkw7l9bGo4HDggNUqdq16YG7/GdBQ2Iy0tLVr7eTAxTqMy8ALR9R7Zu X-Received: by 10.236.231.238 with SMTP id l104mr14035577yhq.51.1406554305786; Mon, 28 Jul 2014 06:31:45 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.97.52 with SMTP id l49ls1994240qge.69.gmail; Mon, 28 Jul 2014 06:31:45 -0700 (PDT) X-Received: by 10.220.250.203 with SMTP id mp11mr318299vcb.2.1406554305643; Mon, 28 Jul 2014 06:31:45 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id z8si12352385vdz.102.2014.07.28.06.31.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Jul 2014 06:31:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hq11so10878324vcb.24 for ; Mon, 28 Jul 2014 06:31:45 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr8095229vcb.0.1406554305544; Mon, 28 Jul 2014 06:31:45 -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 tc5csp166802vcb; Mon, 28 Jul 2014 06:31:45 -0700 (PDT) X-Received: by 10.66.142.42 with SMTP id rt10mr39147221pab.1.1406554303988; Mon, 28 Jul 2014 06:31:43 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pf5si24215pdb.325.2014.07.28.06.31.43 for ; Mon, 28 Jul 2014 06:31:43 -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 S1753035AbaG1Nb2 (ORCPT + 26 others); Mon, 28 Jul 2014 09:31:28 -0400 Received: from mail-ig0-f175.google.com ([209.85.213.175]:63558 "EHLO mail-ig0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752251AbaG1N3W (ORCPT ); Mon, 28 Jul 2014 09:29:22 -0400 Received: by mail-ig0-f175.google.com with SMTP id uq10so3654027igb.2 for ; Mon, 28 Jul 2014 06:29:21 -0700 (PDT) X-Received: by 10.42.82.6 with SMTP id b6mr39909706icl.51.1406554161878; Mon, 28 Jul 2014 06:29:21 -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 i10sm26832385igm.13.2014.07.28.06.29.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Jul 2014 06:29:21 -0700 (PDT) From: Alex Elder To: akpm@linux-foundation.org Cc: kay@vrfy.org, pmladek@suse.cz, john.stultz@linaro.org, jack@suse.cz, linux-kernel@vger.kernel.org Subject: [PATCH v7 2/7] printk: insert newline for truncated records Date: Mon, 28 Jul 2014 08:29:15 -0500 Message-Id: <1406554160-9562-3-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1406554160-9562-1-git-send-email-elder@linaro.org> References: <1406554160-9562-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.179 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: , If a log record has LOG_PREFIX set, its predecessor record should be terminated if it was marked LOG_CONT. In msg_print_text(), this condition was being ignored, which would lead to such records showing up combined when reading /dev/kmsg. Fix this oversight. Suggested-by: Petr Mládek Signed-off-by: Alex Elder Reviewed-by: Petr Mládek --- kernel/printk/printk.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index ffc9928..7dfa658 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1013,6 +1013,12 @@ static size_t msg_print_text(const struct printk_log *msg, enum log_flags prev, newline = false; } + if ((prev & LOG_CONT) && (msg->flags & LOG_PREFIX) && len < size) { + if (buf) + buf[len++] = '\n'; + else + len++; + } do { const char *next = memchr(text, '\n', text_size); size_t text_len;