From: Hillf Danton <hdanton@sina.com>
To: Jason Gunthorpe <jgg@ziepe.ca>
Cc: syzbot <syzbot+45f6cae2ca8c1f71e529@syzkaller.appspotmail.com>,
iommu@lists.linux.dev, linux-kernel@vger.kernel.org,
robin.murphy@arm.com, syzkaller-bugs@googlegroups.com,
Waiman Long <longman@redhat.com>,
will@kernel.org
Subject: Re: [syzbot] [iommu?] KASAN: slab-use-after-free Read in iommufd_ioas_iova_ranges
Date: Fri, 27 Oct 2023 20:54:13 +0800 [thread overview]
Message-ID: <20231027125413.2151-1-hdanton@sina.com> (raw)
In-Reply-To: <20231026114108.GS691768@ziepe.ca>
On Thu, 26 Oct 2023 08:41:08 -0300 Jason Gunthorpe <jgg@ziepe.ca>
> On Thu, Oct 26, 2023 at 07:05:02PM +0800, Hillf Danton wrote:
> > On Wed, 25 Oct 2023 15:32:20 -0300 Jason Gunthorpe <jgg@ziepe.ca>
> > > On Wed, Oct 25, 2023 at 06:11:01AM -0700, syzbot wrote:
> > > > Hello,
> > > >
> > > > syzbot found the following issue on:
> > > >
> > > > HEAD commit: c3200081020d Merge tag 'block-6.6-2023-10-20' of git://git..
> > > > git tree: upstream
> > > > console output: https://syzkaller.appspot.com/x/log.txt?x=15013471680000
> > > > kernel config: https://syzkaller.appspot.com/x/.config?x=849fe52ba7c6d78a
> > > > dashboard link: https://syzkaller.appspot.com/bug?extid=45f6cae2ca8c1f71e529
> > > > compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40
> > > >
> > > > Unfortunately, I don't have any reproducer for this issue yet.
> > > >
> > > > Downloadable assets:
> > > > disk image: https://storage.googleapis.com/syzbot-assets/caa5c1eed3ec/disk-c3200081.raw.xz
> > > > vmlinux: https://storage.googleapis.com/syzbot-assets/7990a3a9f71e/vmlinux-c3200081.xz
> > > > kernel image: https://storage.googleapis.com/syzbot-assets/015551ac9acc/bzImage-c3200081.xz
> > > >
> > > > IMPORTANT: if you fix the issue, please add the following tag to the commit:
> > > > Reported-by: syzbot+45f6cae2ca8c1f71e529@syzkaller.appspotmail.com
> > > >
> > > > ==================================================================
> > > > BUG: KASAN: slab-use-after-free in __up_read+0xb3/0x690 kernel/locking/rwsem.c:1342
> > > > Read of size 8 at addr ffff8880283c9068 by task syz-executor.2/30372
> > >
> > > Oh *ugh* I knew about this limitation once and forgot about it
> > > apparently.
> > >
> > > CPU 0 CPU1
> > > down_read()
> > > up_read()
> > > down_write()
> > > up_write()
> > > kfree()
> > > [..]
> > > tail portion of up_read()
> > >
> > > I suppose the rwsem should be turned into a refcount and completion
> >
> > The line [1] syzbot caught is before preempt is disabled,
>
> So? It is SMP.
>
> > so no lock is released yet, and the report is a simple uaf with
> > nothing to do with down_write().
>
> down_write() is one of the concurrent paths toward kfree.
>
> tmp = atomic_long_add_return_release(-RWSEM_READER_BIAS, &sem->count);
> ^^^^ This allows the down_write to proceed to kfree
>
> DEBUG_RWSEMS_WARN_ON(tmp < 0, sem);
> if (unlikely((tmp & (RWSEM_LOCK_MASK|RWSEM_FLAG_WAITERS)) ==
> RWSEM_FLAG_WAITERS)) {
> clear_nonspinnable(sem);
> rwsem_wake(sem);
> }
>
> And so if we are unlucky we can UAF someplace in this latter part.
Hm ... let me work it out.
__up_read(&foo->sem) rwsem_down_write_slowpath(&foo->sem)
=== ===
rwsem_add_waiter(sem, &waiter);
atomic_long_or(RWSEM_FLAG_WAITERS, &sem->count);
tmp = atomic_long_add_return_release(-RWSEM_READER_BIAS, &sem->count);
if (unlikely((tmp & (RWSEM_LOCK_MASK|RWSEM_FLAG_WAITERS)) ==
RWSEM_FLAG_WAITERS)) {
if (rwsem_try_write_lock(sem, &waiter)) {
/* ACQUIRE on success */
...
up_write(&foo->sem);
kfree(foo);
}
clear_nonspinnable(sem); <-- UAF
rwsem_wake(sem);
}
Sigh ... the race between up_read() and down_write() exists.
Fix it by moving setting RWSEM_FLAG_WAITERS to rwsem_try_write_lock().
Only for thoughts.
--- x/kernel/locking/rwsem.c
+++ y/kernel/locking/rwsem.c
@@ -606,6 +606,8 @@ static inline bool rwsem_try_write_lock(
{
struct rwsem_waiter *first = rwsem_first_waiter(sem);
long count, new;
+ bool single = list_is_singular(&sem->wait_list);
+ bool set_hoff;
lockdep_assert_held(&sem->wait_lock);
@@ -613,6 +615,7 @@ static inline bool rwsem_try_write_lock(
do {
bool has_handoff = !!(count & RWSEM_FLAG_HANDOFF);
+ set_hoff = true;
if (has_handoff) {
/*
* Honor handoff bit and yield only when the first
@@ -631,20 +634,29 @@ static inline bool rwsem_try_write_lock(
* if it is an RT task or wait in the wait queue
* for too long.
*/
- if (has_handoff || (!rt_task(waiter->task) &&
- !time_after(jiffies, waiter->timeout)))
+ if (has_handoff)
return false;
-
- new |= RWSEM_FLAG_HANDOFF;
+ if (!rt_task(waiter->task) &&
+ !time_after(jiffies, waiter->timeout)) {
+ if (!single)
+ return false;
+ if (new & RWSEM_FLAG_WAITERS)
+ return false;
+ new |= RWSEM_FLAG_WAITERS;
+ set_hoff = false;
+ } else {
+ new |= RWSEM_FLAG_HANDOFF;
+ if (single)
+ new |= RWSEM_FLAG_WAITERS;
+ }
} else {
new |= RWSEM_WRITER_LOCKED;
new &= ~RWSEM_FLAG_HANDOFF;
-
- if (list_is_singular(&sem->wait_list))
- new &= ~RWSEM_FLAG_WAITERS;
}
} while (!atomic_long_try_cmpxchg_acquire(&sem->count, &count, new));
+ if (!set_hoff)
+ return false;
/*
* We have either acquired the lock with handoff bit cleared or set
* the handoff bit. Only the first waiter can have its handoff_set
@@ -1141,7 +1153,7 @@ rwsem_down_write_slowpath(struct rw_sema
raw_spin_lock_irq(&sem->wait_lock);
}
} else {
- atomic_long_or(RWSEM_FLAG_WAITERS, &sem->count);
+ /* see RWSEM_FLAG_WAITERS in rwsem_try_write_lock() */
}
/* wait until we successfully acquire the lock */
--
next prev parent reply other threads:[~2023-10-27 12:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-25 13:11 [syzbot] [iommu?] KASAN: slab-use-after-free Read in iommufd_ioas_iova_ranges syzbot
2023-10-25 18:32 ` Jason Gunthorpe
2023-10-26 11:05 ` Hillf Danton
2023-10-26 11:41 ` Jason Gunthorpe
2023-10-27 12:54 ` Hillf Danton [this message]
2023-10-30 12:44 ` Hillf Danton
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=20231027125413.2151-1-hdanton@sina.com \
--to=hdanton@sina.com \
--cc=iommu@lists.linux.dev \
--cc=jgg@ziepe.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=longman@redhat.com \
--cc=robin.murphy@arm.com \
--cc=syzbot+45f6cae2ca8c1f71e529@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.com \
--cc=will@kernel.org \
/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