linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Sterba <dsterba@suse.cz>
To: Petr Mladek <pmladek@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Chris Mason <clm@fb.com>, Josef Bacik <jbacik@fb.com>,
	Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
	Steven Rostedt <rostedt@goodmis.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Joe Perches <joe@perches.com>, Jaroslav Kysela <perex@perex.cz>,
	Takashi Iwai <tiwai@suse.com>,
	linux-kernel@vger.kernel.org,
	Jason Wessel <jason.wessel@windriver.com>
Subject: Re: [PATCH 1/4] printk/NMI: Handle continuous lines and missing newline
Date: Mon, 31 Oct 2016 09:51:47 +0100	[thread overview]
Message-ID: <20161031085147.GN12522@suse.cz> (raw)
In-Reply-To: <1477583574-30988-2-git-send-email-pmladek@suse.com>

On Thu, Oct 27, 2016 at 05:52:51PM +0200, Petr Mladek wrote:
> +static int printk_nmi_flush_buffer(unsigned char *start, size_t len)
>  {
> -	const char *buf = s->buffer + start;
> +	unsigned char *c, *end;
> +	bool header;
> +
> +	c = start;
> +	end = start + len;
> +	header = true;
> +
> +	/* Print line by line. */
> +	while (c < end) {
> +		if (*c == '\n') {
> +			printk_nmi_flush_line(start, c - start + 1);
> +			start = ++c;
> +			header = true;
> +			continue;
> +		}
>  
> -	printk_nmi_flush_line(buf, (end - start) + 1);
> +		/* Handle continuous lines or missing new line. */
> +		if ((c + 1 < end) && printk_get_level(c)) {
> +			if (header) {
> +				c += 2;
> +				continue;
> +			}
> +
> +			printk_nmi_flush_line(start, c - start);
> +			start = c++;
> +			header = true;
> +			continue;
> +		}
> +
> +		header = false;
> +		c++;
> +	}
> +
> +	/* Check if there was a partial line. Ignore pure header. */
> +	if (start < end && !header) {
> +		printk_nmi_flush_line(start, end - start);
> +		printk_nmi_flush_line("\n", strlen("\n"));

Not introduced by this patch as it was in the original code and the
compiler is smart enough to replace strlen("\n") with 1, but still it
looks strange.

  parent reply	other threads:[~2016-10-31  8:51 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-27 15:52 [PATCH 0/4] printk: Fixes and hardening related to KERN_CONT Petr Mladek
2016-10-27 15:52 ` [PATCH 1/4] printk/NMI: Handle continuous lines and missing newline Petr Mladek
2016-10-27 16:35   ` Joe Perches
2016-10-28  4:08     ` Sergey Senozhatsky
2016-10-31  8:51   ` David Sterba [this message]
2016-10-27 15:52 ` [PATCH 2/4] printk/kdb: Handle more message headers Petr Mladek
2016-10-27 16:57   ` Joe Perches
2016-10-27 15:52 ` [PATCH 3/4] printk/btrfs: " Petr Mladek
2016-10-27 16:12   ` Joe Perches
2016-10-31  8:57   ` David Sterba
2016-10-27 15:52 ` [PATCH 4/4] printk/sound: " Petr Mladek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161031085147.GN12522@suse.cz \
    --to=dsterba@suse.cz \
    --cc=akpm@linux-foundation.org \
    --cc=clm@fb.com \
    --cc=jason.wessel@windriver.com \
    --cc=jbacik@fb.com \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=pmladek@suse.com \
    --cc=rostedt@goodmis.org \
    --cc=sergey.senozhatsky.work@gmail.com \
    --cc=tiwai@suse.com \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).