Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   David Laight <David.Laight@ACULAB.COM>
To:     'Kees Cook' <keescook@chromium.org>, Petr Mladek <pmladek@suse.com>
CC:     Sergey Senozhatsky <senozhatsky@chromium.org>,
        Steven Rostedt <rostedt@goodmis.org>,
        John Ogness <john.ogness@linutronix.de>,
        "Vijay Balakrishna" <vijayb@linux.microsoft.com>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>,
        Tony Luck <tony.luck@intel.com>,
        "Guilherme G. Piccoli" <gpiccoli@igalia.com>,
        "Paul E. McKenney" <paulmck@kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-hardening@vger.kernel.org" <linux-hardening@vger.kernel.org>
Subject: RE: [PATCH] printk: ringbuffer: Fix truncating buffer size min_t cast
Thread-Topic: [PATCH] printk: ringbuffer: Fix truncating buffer size min_t
 cast
Thread-Index: AQHZzBcPYpG1g1kNlkm6DrLi5BIXA6/pnsfQ
Date:   Mon, 14 Aug 2023 10:42:26 +0000
Message-ID: <42a1e2099fe141c3a57e808cbf06d8a0@AcuMS.aculab.com>
References: <20230811054528.never.165-kees@kernel.org>
In-Reply-To: <20230811054528.never.165-kees@kernel.org>
Accept-Language: en-GB, en-US
MIME-Version: 1.0
Content-Language: en-US
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8BIT
Precedence: bulk

From: Kees Cook
> Sent: 11 August 2023 06:46
> 
> If an output buffer size exceeded U16_MAX, the min_t(u16, ...) cast in
> copy_data() was causing writes to truncate. This manifested as output
> bytes being skipped, seen as %NUL bytes in pstore dumps when the available
> record size was larger than 65536. Fix the cast to no longer truncate
> the calculation.
> 
...
> diff --git a/kernel/printk/printk_ringbuffer.c b/kernel/printk/printk_ringbuffer.c
> index 2dc4d5a1f1ff..fde338606ce8 100644
> --- a/kernel/printk/printk_ringbuffer.c
> +++ b/kernel/printk/printk_ringbuffer.c
> @@ -1735,7 +1735,7 @@ static bool copy_data(struct prb_data_ring *data_ring,
>  	if (!buf || !buf_size)
>  		return true;
> 
> -	data_size = min_t(u16, buf_size, len);
> +	data_size = min_t(unsigned int, buf_size, len);

I'd noticed that during one of my test compiles while looking
at making min() less fussy.

A better fix would be:
	data_size = min(buf_size + 0u, len);

Or put an ack on my patch 3/5 to minmax.h and then min(buf_size, len)
will be fine (because both arguments are unsigned).

	David

> 
>  	memcpy(&buf[0], data, data_size); /* LMM(copy_data:A) */
>  	return true;
> --
> 2.34.1

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)