Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
From: ebiederm@xmission.com (Eric W. Biederman)
To: Michael Kerrisk (man-pages) <mtk.manpages@gmail.com>
Cc: "Arnd Bergmann" <arnd@arndb.de>,
	"Alexander Viro" <viro@zeniv.linux.org.uk>,
	"Serge Hallyn" <serge@hallyn.com>,
	"Andrei Vagin" <avagin@gmail.com>,
	"Ákos Uzonyi" <uzonyi.akos@gmail.com>,
	"Linux FS-devel Mailing List" <linux-fsdevel@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"Dmitry V. Levin" <ldv@altlinux.org>
Subject: Re: [PATCH] fs/nsfs.c: fix ioctl support of compat processes
Date: Fri, 24 Jul 2020 14:31:19 -0500	[thread overview]
Message-ID: <878sf8ogl4.fsf@x220.int.ebiederm.org> (raw)
In-Reply-To: <20200724102848.GA1654@altlinux.org> (Dmitry V. Levin's message of "Fri, 24 Jul 2020 13:28:49 +0300")


Michael,

As the original author of NS_GET_OWNER_UID can you take a look at this?

"Dmitry V. Levin" <ldv@altlinux.org> writes:

> On Fri, Jul 24, 2020 at 11:20:26AM +0200, Arnd Bergmann wrote:
>> On Fri, Jul 24, 2020 at 2:12 AM Dmitry V. Levin <ldv@altlinux.org> wrote:
>> >
>> > According to Documentation/driver-api/ioctl.rst, in order to support
>> > 32-bit user space running on a 64-bit kernel, each subsystem or driver
>> > that implements an ioctl callback handler must also implement the
>> > corresponding compat_ioctl handler.  The compat_ptr_ioctl() helper can
>> > be used in place of a custom compat_ioctl file operation for drivers
>> > that only take arguments that are pointers to compatible data
>> > structures.
>> >
>> > In case of NS_* ioctls only NS_GET_OWNER_UID accepts an argument, and
>> > this argument is a pointer to uid_t type, which is universally defined
>> > to __kernel_uid32_t.
>> 
>> This is potentially dangerous to rely on, as there are two parts that
>> are mismatched:
>> 
>> - user space does not see the kernel's uid_t definition, but has its own,
>>   which may be either the 16-bit or the 32-bit type. 32-bit uid_t was
>>   introduced with linux-2.3.39 in back in 2000. glibc was already
>>   using 32-bit uid_t at the time in user space, but uclibc only changed
>>   in 2003, and others may have been even later.
>> 
>> - the ioctl command number is defined (incorrectly) as if there was no
>>   argument, so if there is any user space that happens to be built with
>>   a 16-bit uid_t, this does not get caught.
>
> Note that NS_GET_OWNER_UID is provided on 32-bit architectures, too, so
> this 16-bit vs 32-bit uid_t issue was exposed to userspace long time ago
> when NS_GET_OWNER_UID was introduced, and making NS_GET_OWNER_UID
> available for compat processes won't make any difference, as the mismatch
> is not between native and compat types, but rather between 16-bit and
> 32-bit uid_t types.
>
> I agree it would be correct to define NS_GET_OWNER_UID as
> _IOR(NSIO, 0x4, uid_t) instead of _IO(NSIO, 0x4), but nobody Cc'ed me
> on this topic when NS_GET_OWNER_UID was discussed, and that ship has long
> sailed.
>
>> > This change fixes compat strace --pidns-translation.
>> > 
>> > Note: when backporting this patch to stable kernels, commit
>> > "compat_ioctl: add compat_ptr_ioctl()" is needed as well.
>> > 
>> > Reported-by: Ákos Uzonyi <uzonyi.akos@gmail.com>
>> > Fixes: 6786741dbf99 ("nsfs: add ioctl to get an owning user namespace for ns file descriptor")
>> > Cc: stable@vger.kernel.org # v4.9+
>> > Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
>> > ---
>> >  fs/nsfs.c | 1 +
>> >  1 file changed, 1 insertion(+)
>> >
>> > diff --git a/fs/nsfs.c b/fs/nsfs.c
>> > index 800c1d0eb0d0..a00236bffa2c 100644
>> > --- a/fs/nsfs.c
>> > +++ b/fs/nsfs.c
>> > @@ -21,6 +21,7 @@ static long ns_ioctl(struct file *filp, unsigned int ioctl,
>> >  static const struct file_operations ns_file_operations = {
>> >         .llseek         = no_llseek,
>> >         .unlocked_ioctl = ns_ioctl,
>> > +       .compat_ioctl   = compat_ptr_ioctl,
>> >  };
>> >
>> >  static char *ns_dname(struct dentry *dentry, char *buffer, int buflen)

Thank you,
Eric

  reply	other threads:[~2020-07-24 19:34 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-24  0:12 Dmitry V. Levin
2020-07-24  9:20 ` Arnd Bergmann
2020-07-24 10:28   ` Dmitry V. Levin
2020-07-24 19:31     ` Eric W. Biederman [this message]
2020-09-07 18:17       ` Dmitry V. Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=878sf8ogl4.fsf@x220.int.ebiederm.org \
    --to=ebiederm@xmission.com \
    --cc=arnd@arndb.de \
    --cc=avagin@gmail.com \
    --cc=ldv@altlinux.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mtk.manpages@gmail.com \
    --cc=serge@hallyn.com \
    --cc=uzonyi.akos@gmail.com \
    --cc=viro@zeniv.linux.org.uk \
    --subject='Re: [PATCH] fs/nsfs.c: fix ioctl support of compat processes' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).