Message-ID: <63e2de98.170a0220.81eb8.02cb@mx.google.com>
Date:   Tue, 7 Feb 2023 15:28:23 -0800
From:   Kees Cook <keescook@chromium.org>
To:     Yann Droneaud <ydroneaud@ouvaton.org>
Cc:     Geert Uytterhoeven <geert@linux-m68k.org>,
        Arnd Bergmann <arnd@arndb.de>,
        Aleksa Sarai <cyphar@cyphar.com>,
        Christian Brauner <christian.brauner@ubuntu.com>,
        Rasmus Villemoes <linux@rasmusvillemoes.dk>,
        Dinh Nguyen <dinguyen@kernel.org>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Alexander Potapenko <glider@google.com>,
        Christian Brauner <brauner@kernel.org>,
        Stafford Horne <shorne@gmail.com>,
        Alexander Viro <viro@zeniv.linux.org.uk>,
        Christophe Leroy <christophe.leroy@csgroup.eu>,
        linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org
Subject: Re: [PATCH] uaccess: Add minimum bounds check on kernel buffer size
References: <20230203193523.never.667-kees@kernel.org>
 <6c728dfc-d777-4beb-b463-649704c81a5e@app.fastmail.com>
 <CAMuHMdXXSwYYoUMskhcgjF9SVjraZC-UsBT3sN+xkcUAYmJj4Q-2143@mail.gmail.com>
 <9f549c7b-bc72-8037-abfc-fe2f146ff82c@ouvaton.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <9f549c7b-bc72-8037-abfc-fe2f146ff82c@ouvaton.org>
Precedence: bulk

On Tue, Feb 07, 2023 at 10:06:14AM +0100, Yann Droneaud wrote:
> Hi,
> 
> Le 06/02/2023 ? 21:03, Geert Uytterhoeven a ?crit?:
> 
> > Hi Arnd,
> > 
> > On Fri, Feb 3, 2023 at 10:23 PM Arnd Bergmann <arnd@arndb.de> wrote:
> > > On Fri, Feb 3, 2023, at 20:35, Kees Cook wrote:
> > > > --- a/include/linux/uaccess.h
> > > > +++ b/include/linux/uaccess.h
> > > > @@ -329,6 +329,10 @@ copy_struct_from_user(void *dst, size_t ksize,
> > > > const void __user *src,
> > > >        size_t size = min(ksize, usize);
> > > >        size_t rest = max(ksize, usize) - size;
> > > > 
> > > > +     /* Double check if ksize is larger than a known object size. */
> > > > +     if (WARN_ON_ONCE(ksize > __builtin_object_size(dst, 1)))
> > > > +             return -E2BIG;
> > > > +
> > > WARN_ON_ONCE() may be a little expensive since that adds two
> > > comparisons and a static variable to each copy, but it's probably
> > > fine.
> > When seeing this, I was a bit worried about the size increase.
> > Hence I gave it a try on atari_defconfig and ran bloat-o-meter.
> > Surprisingly, there was no size increase at all, as all checks
> > were optimized away.
> > 
> > Hence perhaps this can become a compile-time check?
> 
> It should be a compile-time check, because one would not want __builtin_object_size(dst, 1) to return -1 if dst' size is not known at compile-time.

Note that it's size_t, so it's actually SIZE_MAX, which is why these
tests will vanish most of the time. i.e. it cannot ever be possible for
the SIZE_MAX case so the entire test is elided.

And when ksize is known at compile time and __bos is not SIZE_MAX, the
result is also known to be either always true or always false, etc.

What's nice here is that when ksize is only run-time known and the buffer
size is compile-time known, we'll keep the test.

-- 
Kees Cook