Skip to content

timer: pad Data so the ngx_event_ident debug read stays in bounds #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
climagabriel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

timer: pad Data so the ngx_event_ident debug read stays in bounds #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions nginx_module/src/timer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ impl<HandlerFn> Drop for Timer<HandlerFn> {
struct Data<HandlerFn> {
handler: HandlerFn,
interval_msec: usize,
// nginx debug logging reads ngx_event_ident(ev->data), i.e.
// ((ngx_connection_t *) data)->fd — 4 bytes at offset 24; keep the
// allocation large enough for that read to stay in bounds
_ident_pad: [u8; 32],
}

impl<HandlerFn: FnMut()> Timer<HandlerFn> {
Expand All @@ -44,6 +48,7 @@ impl<HandlerFn: FnMut()> Timer<HandlerFn> {
let data = Data {
handler,
interval_msec,
_ident_pad: [0; 32],
};
event.data = Box::into_raw(Box::new(data)).cast();
event.log = unsafe { (*ngx_cycle).log };
Expand Down