Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70a5f521 authored by Andrew Morton's avatar Andrew Morton Committed by Greg Kroah-Hartman
Browse files

kmsg: properly support writev to avoid interleaved printk lines fix 



make `len' size_t, avoid multiple-assignments.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Lennart Poettering <lennart@poettering.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7e5b58bc

drivers/char/mem.c

+4 −3
Original line number Diff line number Diff line
@@ -810,11 +810,11 @@ static ssize_t kmsg_writev(struct kiocb *iocb, const struct iovec *iv, 
			   unsigned long count, loff_t pos)

{

	char *line, *p;

	int len, i;

	int i;

	ssize_t ret = -EFAULT;

	size_t len = iov_length(iv, count);



	len = iov_length(iv, count);

	line = p = kmalloc(len + 1, GFP_KERNEL);

	line = kmalloc(len + 1, GFP_KERNEL);

	if (line == NULL)

		return -ENOMEM;
@@ -822,6 +822,7 @@ static ssize_t kmsg_writev(struct kiocb *iocb, const struct iovec *iv, 
	 * copy all vectors into a single string, to ensure we do

	 * not interleave our log line with other printk calls

	 */

	p = line;

	for (i = 0; i < count; i++) {

		if (copy_from_user(p, iv[i].iov_base, iv[i].iov_len))

			goto out;