diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-11-18 03:13:27 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-11-24 08:29:58 +0300 |
| commit | d4e3b928ab487a8aecd1f6a140b40ac365116cfb (patch) | |
| tree | 3beb53d9f7492d60014d84af51ad7e3c56ade753 /fs/bcachefs/journal_io.h | |
| parent | 98b1cc82c4affc16f5598d4fa14b1858671b2263 (diff) | |
| download | linux-d4e3b928ab487a8aecd1f6a140b40ac365116cfb.tar.xz | |
closures: CLOSURE_CALLBACK() to fix type punning
Control flow integrity is now checking that type signatures match on
indirect function calls. That breaks closures, which embed a work_struct
in a closure in such a way that a closure_fn may also be used as a
workqueue fn by the underlying closure code.
So we have to change closure fns to take a work_struct as their
argument - but that results in a loss of clarity, as closure fns have
different semantics from normal workqueue functions (they run owning a
ref on the closure, which must be released with continue_at() or
closure_return()).
Thus, this patc introduces CLOSURE_CALLBACK() and closure_type() macros
as suggested by Kees, to smooth things over a bit.
Suggested-by: Kees Cook <keescook@chromium.org>
Cc: Coly Li <colyli@suse.de>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/journal_io.h')
| -rw-r--r-- | fs/bcachefs/journal_io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/bcachefs/journal_io.h b/fs/bcachefs/journal_io.h index a88d097b13f1..c035e7c108e1 100644 --- a/fs/bcachefs/journal_io.h +++ b/fs/bcachefs/journal_io.h @@ -60,6 +60,6 @@ void bch2_journal_ptrs_to_text(struct printbuf *, struct bch_fs *, int bch2_journal_read(struct bch_fs *, u64 *, u64 *, u64 *); -void bch2_journal_write(struct closure *); +CLOSURE_CALLBACK(bch2_journal_write); #endif /* _BCACHEFS_JOURNAL_IO_H */ |