From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail-oi0-f67.google.com ([209.85.218.67]:42097 "EHLO
        mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726084AbeIIIpW (ORCPT
        <rfc822;stable@vger.kernel.org>); Sun, 9 Sep 2018 04:45:22 -0400
Received: by mail-oi0-f67.google.com with SMTP id v198-v6so16537708oif.9
        for <stable@vger.kernel.org>; Sat, 08 Sep 2018 20:57:14 -0700 (PDT)
Received: from mail-oi0-f49.google.com (mail-oi0-f49.google.com. [209.85.218.49])
        by smtp.gmail.com with ESMTPSA id b3-v6sm9290137oiy.11.2018.09.08.20.57.11
        for <stable@vger.kernel.org>
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Sat, 08 Sep 2018 20:57:12 -0700 (PDT)
Received: by mail-oi0-f49.google.com with SMTP id l202-v6so34217353oig.7
        for <stable@vger.kernel.org>; Sat, 08 Sep 2018 20:57:11 -0700 (PDT)
MIME-Version: 1.0
References: <20180907210904.607934824@linuxfoundation.org> <20180907210908.241189276@linuxfoundation.org>
In-Reply-To: <20180907210908.241189276@linuxfoundation.org>
From: Rafael David Tinoco <rafael.tinoco@linaro.org>
Date: Sun, 9 Sep 2018 00:56:45 -0300
Message-ID: <CABdQkv8Oxmy7ZcwAhKJ-tYJyqJCWba9+vtGCSgMS2aGymEzhsQ@mail.gmail.com>
Subject: Re: [PATCH 4.4 34/47] userns: move user access out of the mutex
To: gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        jannh@google.com, christian@brauner.io, serge@hallyn.com,
        ebiederm@xmission.com, dan.rue@linaro.org,
        naresh.kamboju@linaro.org
Content-Type: text/plain; charset="UTF-8"
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

Greg,

On Fri, Sep 7, 2018 at 6:41 PM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> 4.4-stable review patch.  If anyone has any objections, please let me know.
>
> ------------------
>
> From: Jann Horn <jannh@google.com>
>
> commit 5820f140edef111a9ea2ef414ab2428b8cb805b1 upstream.
>
> The old code would hold the userns_state_mutex indefinitely if
> memdup_user_nul stalled due to e.g. a userfault region. Prevent that by
> moving the memdup_user_nul in front of the mutex_lock().
>
> Note: This changes the error precedence of invalid buf/count/*ppos vs
> map already written / capabilities missing.
>
> Fixes: 22d917d80e84 ("userns: Rework the user_namespace adding uid/gid...")
> Cc: stable@vger.kernel.org
> Signed-off-by: Jann Horn <jannh@google.com>
> Acked-by: Christian Brauner <christian@brauner.io>
> Acked-by: Serge Hallyn <serge@hallyn.com>
> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> ---
>  kernel/user_namespace.c |   22 ++++++++++------------
>  1 file changed, 10 insertions(+), 12 deletions(-)
>
> --- a/kernel/user_namespace.c
> +++ b/kernel/user_namespace.c
> @@ -604,7 +604,16 @@ static ssize_t map_write(struct file *fi
>         struct uid_gid_extent *extent = NULL;
>         unsigned long page = 0;
>         char *kbuf, *pos, *next_line;
> -       ssize_t ret = -EINVAL;
> +       ssize_t ret;
> +
> +       /* Only allow < page size writes at the beginning of the file */
> +       if ((*ppos != 0) || (count >= PAGE_SIZE))
> +               return -EINVAL;
> +
> +       /* Slurp in the user data */
> +       if (copy_from_user(kbuf, buf, count))
> +               return -EFAULT;
> +       kbuf[count] = '\0';

Naresh will soon report issues found by LKFT on user_ns for 4.4 kernel
for this review round.

selftests: mount_run_tests.sh [FAIL]
write to /proc/self/uid_map failed: Bad address

LTP: user_namespace2 1 TBROK : safe_macros.c:452: userns02.c:95:
write(6,0x7ffc133113d0,18446744073709551615) failed: errno=EFAULT(14):
Bad address

I believe the EFAULT was caused because when changing code from
"memdup_user_nul" to "copy_from_user", for the older kernels, you
missed allocating the slab object for "kbuf", like memdup_user_nul()
does.

Note: This likely applies to 3.18 as well.

We are finishing functional tests without this patch, but we wanted to
make you aware right away.

Best Regards,
Rafael