Skip to content

Commit 17195a7

Browse files
jgunthorpegregkh
authored andcommitted
iommufd: Fix race during abort for file descriptors
[ Upstream commit 4e034bf ] fput() doesn't actually call file_operations release() synchronously, it puts the file on a work queue and it will be released eventually. This is normally fine, except for iommufd the file and the iommufd_object are tied to gether. The file has the object as it's private_data and holds a users refcount, while the object is expected to remain alive as long as the file is. When the allocation of a new object aborts before installing the file it will fput() the file and then go on to immediately kfree() the obj. This causes a UAF once the workqueue completes the fput() and tries to decrement the users refcount. Fix this by putting the core code in charge of the file lifetime, and call __fput_sync() during abort to ensure that release() is called before kfree. __fput_sync() is a bit too tricky to open code in all the object implementations. Instead the objects tell the core code where the file pointer is and the core will take care of the life cycle. If the object is successfully allocated then the file will hold a users refcount and the iommufd_object cannot be destroyed. It is worth noting that close(); ioctl(IOMMU_DESTROY); doesn't have an issue because close() is already using a synchronous version of fput(). The UAF looks like this: BUG: KASAN: slab-use-after-free in iommufd_eventq_fops_release+0x45/0xc0 drivers/iommu/iommufd/eventq.c:376 Write of size 4 at addr ffff888059c97804 by task syz.0.46/6164 CPU: 0 UID: 0 PID: 6164 Comm: syz.0.46 Not tainted syzkaller #0 PREEMPT(full) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 08/18/2025 Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x116/0x1f0 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:378 [inline] print_report+0xcd/0x630 mm/kasan/report.c:482 kasan_report+0xe0/0x110 mm/kasan/report.c:595 check_region_inline mm/kasan/generic.c:183 [inline] kasan_check_range+0x100/0x1b0 mm/kasan/generic.c:189 instrument_atomic_read_write include/linux/instrumented.h:96 [inline] atomic_fetch_sub_release include/linux/atomic/atomic-instrumented.h:400 [inline] __refcount_dec include/linux/refcount.h:455 [inline] refcount_dec include/linux/refcount.h:476 [inline] iommufd_eventq_fops_release+0x45/0xc0 drivers/iommu/iommufd/eventq.c:376 __fput+0x402/0xb70 fs/file_table.c:468 task_work_run+0x14d/0x240 kernel/task_work.c:227 resume_user_mode_work include/linux/resume_user_mode.h:50 [inline] exit_to_user_mode_loop+0xeb/0x110 kernel/entry/common.c:43 exit_to_user_mode_prepare include/linux/irq-entry-common.h:225 [inline] syscall_exit_to_user_mode_work include/linux/entry-common.h:175 [inline] syscall_exit_to_user_mode include/linux/entry-common.h:210 [inline] do_syscall_64+0x41c/0x4c0 arch/x86/entry/syscall_64.c:100 entry_SYSCALL_64_after_hwframe+0x77/0x7f Link: https://patch.msgid.link/r/[email protected] Cc: [email protected] Fixes: 07838f7 ("iommufd: Add iommufd fault object") Reviewed-by: Nicolin Chen <[email protected]> Reviewed-by: Nirmoy Das <[email protected]> Reviewed-by: Kevin Tian <[email protected]> Tested-by: Nicolin Chen <[email protected]> Reported-by: [email protected] Closes: https://lore.kernel.org/r/[email protected] Signed-off-by: Jason Gunthorpe <[email protected]> [ applied eventq.c changes to fault.c, drop veventq bits ] Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 51b8258 commit 17195a7

File tree

2 files changed

+32
-6
lines changed

2 files changed

+32
-6
lines changed

drivers/iommu/iommufd/fault.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ int iommufd_fault_alloc(struct iommufd_ucmd *ucmd)
415415
fdno = get_unused_fd_flags(O_CLOEXEC);
416416
if (fdno < 0) {
417417
rc = fdno;
418-
goto out_fput;
418+
goto out_abort;
419419
}
420420

421421
cmd->out_fault_id = fault->obj.id;
@@ -431,8 +431,6 @@ int iommufd_fault_alloc(struct iommufd_ucmd *ucmd)
431431
return 0;
432432
out_put_fdno:
433433
put_unused_fd(fdno);
434-
out_fput:
435-
fput(filep);
436434
out_abort:
437435
iommufd_object_abort_and_destroy(ucmd->ictx, &fault->obj);
438436

drivers/iommu/iommufd/main.c

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "iommufd_test.h"
2424

2525
struct iommufd_object_ops {
26+
size_t file_offset;
2627
void (*destroy)(struct iommufd_object *obj);
2728
void (*abort)(struct iommufd_object *obj);
2829
};
@@ -97,10 +98,30 @@ void iommufd_object_abort(struct iommufd_ctx *ictx, struct iommufd_object *obj)
9798
void iommufd_object_abort_and_destroy(struct iommufd_ctx *ictx,
9899
struct iommufd_object *obj)
99100
{
100-
if (iommufd_object_ops[obj->type].abort)
101-
iommufd_object_ops[obj->type].abort(obj);
101+
const struct iommufd_object_ops *ops = &iommufd_object_ops[obj->type];
102+
103+
if (ops->file_offset) {
104+
struct file **filep = ((void *)obj) + ops->file_offset;
105+
106+
/*
107+
* A file should hold a users refcount while the file is open
108+
* and put it back in its release. The file should hold a
109+
* pointer to obj in their private data. Normal fput() is
110+
* deferred to a workqueue and can get out of order with the
111+
* following kfree(obj). Using the sync version ensures the
112+
* release happens immediately. During abort we require the file
113+
* refcount is one at this point - meaning the object alloc
114+
* function cannot do anything to allow another thread to take a
115+
* refcount prior to a guaranteed success.
116+
*/
117+
if (*filep)
118+
__fput_sync(*filep);
119+
}
120+
121+
if (ops->abort)
122+
ops->abort(obj);
102123
else
103-
iommufd_object_ops[obj->type].destroy(obj);
124+
ops->destroy(obj);
104125
iommufd_object_abort(ictx, obj);
105126
}
106127

@@ -498,6 +519,12 @@ void iommufd_ctx_put(struct iommufd_ctx *ictx)
498519
}
499520
EXPORT_SYMBOL_NS_GPL(iommufd_ctx_put, IOMMUFD);
500521

522+
#define IOMMUFD_FILE_OFFSET(_struct, _filep, _obj) \
523+
.file_offset = (offsetof(_struct, _filep) + \
524+
BUILD_BUG_ON_ZERO(!__same_type( \
525+
struct file *, ((_struct *)NULL)->_filep)) + \
526+
BUILD_BUG_ON_ZERO(offsetof(_struct, _obj)))
527+
501528
static const struct iommufd_object_ops iommufd_object_ops[] = {
502529
[IOMMUFD_OBJ_ACCESS] = {
503530
.destroy = iommufd_access_destroy_object,
@@ -518,6 +545,7 @@ static const struct iommufd_object_ops iommufd_object_ops[] = {
518545
},
519546
[IOMMUFD_OBJ_FAULT] = {
520547
.destroy = iommufd_fault_destroy,
548+
IOMMUFD_FILE_OFFSET(struct iommufd_fault, filep, obj),
521549
},
522550
#ifdef CONFIG_IOMMUFD_TEST
523551
[IOMMUFD_OBJ_SELFTEST] = {

0 commit comments

Comments
 (0)