From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: Stefan Hajnoczi <stefanha@redhat.com>
Cc: mszeredi@redhat.com, Daniel Berrange <berrange@redhat.com>,
slp@redhat.com, Greg Kurz <groug@kaod.org>,
qemu-devel@nongnu.org, virtio-fs@redhat.com,
Alex Xu <alex@alxu.ca>, P J P <ppandit@redhat.com>,
Laszlo Ersek <lersek@redhat.com>, Vivek Goyal <vgoyal@redhat.com>
Subject: Re: [PATCH v4 3/3] virtiofsd: prevent opening of special files (CVE-2020-35517)
Date: Wed, 3 Feb 2021 18:05:20 +0000 [thread overview]
Message-ID: <20210203180520.GO2950@work-vm> (raw)
In-Reply-To: <20210203170514.GL74271@stefanha-x1.localdomain>
* Stefan Hajnoczi (stefanha@redhat.com) wrote:
> On Wed, Feb 03, 2021 at 11:08:58AM -0500, Vivek Goyal wrote:
> > On Wed, Feb 03, 2021 at 05:02:37PM +0100, Greg Kurz wrote:
> > > On Wed, 3 Feb 2021 10:28:50 -0500
> > > Vivek Goyal <vgoyal@redhat.com> wrote:
> > >
> > > > On Wed, Feb 03, 2021 at 11:37:19AM +0000, Stefan Hajnoczi wrote:
> > > >
> > > > [..]
> > > > > @@ -1727,36 +1764,38 @@ static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name,
> > > > >
> > > > > update_open_flags(lo->writeback, lo->allow_direct_io, fi);
> > > > >
> > > > > - fd = openat(parent_inode->fd, name, (fi->flags | O_CREAT) & ~O_NOFOLLOW,
> > > > > - mode);
> > > > > + /* Try to create a new file but don't open existing files */
> > > > > + fd = openat(parent_inode->fd, name, fi->flags | O_CREAT | O_EXCL, mode);
> > > > > err = fd == -1 ? errno : 0;
> > > > > +
> > > > > lo_restore_cred(&old);
> > > > >
> > > > > - if (!err) {
> > > > > - ssize_t fh;
> > > > > -
> > > > > - pthread_mutex_lock(&lo->mutex);
> > > > > - fh = lo_add_fd_mapping(lo, fd);
> > > > > - pthread_mutex_unlock(&lo->mutex);
> > > > > - if (fh == -1) {
> > > > > - close(fd);
> > > > > - err = ENOMEM;
> > > > > - goto out;
> > > > > - }
> > > > > + /* Ignore the error if file exists and O_EXCL was not given */
> > > > > + if (err && !(err == EEXIST && !(fi->flags & O_EXCL))) {
> > > >
> > > > Can this check be simplified to.
> > > > if (err && (err == EEXIST && (fi->flags & O_EXCL)) {
> > >
> > > I guess you meant :
> > >
> > > if (err && (err != EEXIST || fi->flags & O_EXCL) {
> >
> > This sounds correct. I forgot to take into account that if error is
> > not -EEXIST, we still want to bail out irrespective of O_EXCL.
>
> I thought about De Morgan's law too but found the OR expression is not
> easier to read than the AND expression :(. If you prefer it written this
> way I can change it though.
I think the version that you put, matches your comment well; although
it's a bit of a weird case where nesting a pair of ! makes sense.
Dave
> Stefan
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
next prev parent reply other threads:[~2021-02-03 18:16 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-03 11:37 [PATCH v4 0/3] virtiofsd: prevent opening of special files (CVE-2020-35517) Stefan Hajnoczi
2021-02-03 11:37 ` [PATCH v4 1/3] virtiofsd: extract lo_do_open() from lo_open() Stefan Hajnoczi
2021-02-03 14:20 ` Greg Kurz
2021-02-03 14:47 ` Dr. David Alan Gilbert
2021-02-03 15:45 ` Greg Kurz
2021-02-03 17:47 ` Greg Kurz
2021-02-03 16:57 ` Stefan Hajnoczi
2021-02-03 11:37 ` [PATCH v4 2/3] virtiofsd: optionally return inode pointer from lo_do_lookup() Stefan Hajnoczi
2021-02-03 14:20 ` Greg Kurz
2021-02-03 17:00 ` Stefan Hajnoczi
2021-02-04 8:25 ` Greg Kurz
2021-02-04 9:45 ` Stefan Hajnoczi
2021-02-04 11:19 ` Greg Kurz
2021-02-03 11:37 ` [PATCH v4 3/3] virtiofsd: prevent opening of special files (CVE-2020-35517) Stefan Hajnoczi
2021-02-03 15:28 ` Vivek Goyal
2021-02-03 16:02 ` Greg Kurz
2021-02-03 16:08 ` Vivek Goyal
2021-02-03 17:05 ` Stefan Hajnoczi
2021-02-03 18:05 ` Dr. David Alan Gilbert [this message]
2021-02-03 21:14 ` Vivek Goyal
2021-02-04 9:47 ` Stefan Hajnoczi
2021-02-03 15:57 ` Greg Kurz
2021-02-03 17:06 ` Stefan Hajnoczi
2021-02-03 11:46 ` [PATCH v4 0/3] " no-reply
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=20210203180520.GO2950@work-vm \
--to=dgilbert@redhat.com \
--cc=alex@alxu.ca \
--cc=berrange@redhat.com \
--cc=groug@kaod.org \
--cc=lersek@redhat.com \
--cc=mszeredi@redhat.com \
--cc=ppandit@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=slp@redhat.com \
--cc=stefanha@redhat.com \
--cc=vgoyal@redhat.com \
--cc=virtio-fs@redhat.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).