Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Content-Type: text/plain;
        charset=utf-8
Mime-Version: 1.0 (1.0)
Subject: Re: mmotm 2019-04-19-14-53 uploaded (objtool)
From:   Andy Lutomirski <luto@amacapital.net>
In-Reply-To: <20190423082448.GY11158@hirez.programming.kicks-ass.net>
Date:   Tue, 23 Apr 2019 09:07:01 -0700
Cc:     Randy Dunlap <rdunlap@infradead.org>, akpm@linux-foundation.org,
        broonie@kernel.org, linux-fsdevel@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-mm@kvack.org,
        linux-next@vger.kernel.org, mhocko@suse.cz,
        mm-commits@vger.kernel.org, sfr@canb.auug.org.au,
        Josh Poimboeuf <jpoimboe@redhat.com>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Andy Lutomirski <luto@kernel.org>
Content-Transfer-Encoding: quoted-printable
Message-Id: <D7626BC0-FCE9-4424-A6F5-D4AAB6727ED4@amacapital.net>
References: <20190419215358.WMVFXV3bT%akpm@linux-foundation.org> <af3819b4-008f-171e-e721-a9a20f85d8d1@infradead.org> <20190423082448.GY11158@hirez.programming.kicks-ass.net>
To:     Peter Zijlstra <peterz@infradead.org>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


> On Apr 23, 2019, at 1:24 AM, Peter Zijlstra <peterz@infradead.org> wrote:
>=20
>> On Fri, Apr 19, 2019 at 09:36:46PM -0700, Randy Dunlap wrote:
>>> On 4/19/19 2:53 PM, akpm@linux-foundation.org wrote:
>>> The mm-of-the-moment snapshot 2019-04-19-14-53 has been uploaded to
>>>=20
>>>   http://www.ozlabs.org/~akpm/mmotm/
>>>=20
>>> mmotm-readme.txt says
>>>=20
>>> README for mm-of-the-moment:
>>>=20
>>> http://www.ozlabs.org/~akpm/mmotm/
>>>=20
>>> This is a snapshot of my -mm patch queue.  Uploaded at random hopefully
>>> more than once a week.
>>=20
>> on x86_64:
>>=20
>>  CC      lib/strncpy_from_user.o
>> lib/strncpy_from_user.o: warning: objtool: strncpy_from_user()+0x315: cal=
l to __ubsan_handle_add_overflow() with UACCESS enabled
>>  CC      lib/strnlen_user.o
>> lib/strnlen_user.o: warning: objtool: strnlen_user()+0x337: call to __ubs=
an_handle_sub_overflow() with UACCESS enabled
>=20
> Lemme guess, you're using GCC < 8 ? That had a bug where UBSAN
> considered signed overflow UB when using -fno-strict-overflow or
> -fwrapv.
>=20
> Now, we could of course allow this symbol, but I found only the below
> was required to make allyesconfig build without issue.
>=20
> Andy, Linus?
>=20
> (note: the __put_user thing is from this one:
>=20
>  drivers/gpu/drm/i915/i915_gem_execbuffer.c:    if (unlikely(__put_user(of=
fset, &urelocs[r-stack].presumed_offset))) {
>=20
> where (ptr) ends up non-trivial due to UBSAN)
>=20
> ---
>=20
> diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess=
.h
> index 22ba683afdc2..c82abd6e4ca3 100644
> --- a/arch/x86/include/asm/uaccess.h
> +++ b/arch/x86/include/asm/uaccess.h
> @@ -427,10 +427,11 @@ do {                                    \
> ({                                \
>    __label__ __pu_label;                    \
>    int __pu_err =3D -EFAULT;                    \
> -    __typeof__(*(ptr)) __pu_val;                \
> -    __pu_val =3D x;                        \
> +    __typeof__(*(ptr)) __pu_val =3D (x);            \
> +    __typeof__(ptr) __pu_ptr =3D (ptr);            \

Hmm.  I wonder if this forces the address calculation to be done before STAC=
, which means that gcc can=E2=80=99t use mov ..., %gs:(fancy stuff).  It pro=
bably depends on how clever the optimizer is. Have you looked at the generat=
ed code?

Other than that, it seems reasonable to me.

> +    __typeof__(size) __pu_size =3D (size);            \
>    __uaccess_begin();                    \
> -    __put_user_size(__pu_val, (ptr), (size), __pu_label);    \
> +    __put_user_size(__pu_val, __pu_ptr, __pu_size, __pu_label);    \
>    __pu_err =3D 0;                        \
> __pu_label:                            \
>    __uaccess_end();                    \
> diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
> index 58eacd41526c..07045bc4872e 100644
> --- a/lib/strncpy_from_user.c
> +++ b/lib/strncpy_from_user.c
> @@ -26,7 +26,7 @@
> static inline long do_strncpy_from_user(char *dst, const char __user *src,=
 long count, unsigned long max)
> {
>    const struct word_at_a_time constants =3D WORD_AT_A_TIME_CONSTANTS;
> -    long res =3D 0;
> +    unsigned long res =3D 0;
>=20
>    /*
>     * Truncate 'max' to the user-specified limit, so that
> diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
> index 1c1a1b0e38a5..0729378ad3e9 100644
> --- a/lib/strnlen_user.c
> +++ b/lib/strnlen_user.c
> @@ -28,7 +28,7 @@
> static inline long do_strnlen_user(const char __user *src, unsigned long c=
ount, unsigned long max)
> {
>    const struct word_at_a_time constants =3D WORD_AT_A_TIME_CONSTANTS;
> -    long align, res =3D 0;
> +    unsigned long align, res =3D 0;
>    unsigned long c;
>=20
>    /*
>=20