Mercurial > hg > nginx
view src/core/ngx_bpf.c @ 9217:6765e5f6d991
Upstream: fixed X-Accel-Redirect handling from cache files.
The X-Accel-Redirect header might appear in cache files if its handling
is ignored with the "proxy_ignore_headers" directive. If the cache file
is later served with different settings, ngx_http_upstream_process_headers()
used to call ngx_http_upstream_finalize_request(NGX_DECLINED), which
is not expected to happen before the cleanup handler is installed and
resulted in ngx_http_finalize_request(NGX_DONE) (after 5994:5abf5af257a7,
nginx 1.7.11), leading to unexpected request counter decrement, "request
count is zero" alerts, and segmentation faults.
Similarly, errors in ngx_http_upstream_process_headers() resulted in
ngx_http_upstream_finalize_request(NGX_HTTP_INTERNAL_SERVER_ERROR) being
called. This is also not expected to happen before the cleanup handler is
installed, and resulted in ngx_http_finalize_request(NGX_DONE) without
proper request finalization.
Fix is to avoid calling ngx_http_upstream_finalize_request() from
ngx_http_upstream_process_headers(), notably when the cleanup handler
is not yet installed. Errors are now simply return NGX_ERROR, so the
caller is responsible for proper finalization by calling either
ngx_http_finalize_request() or ngx_http_upstream_finalize_request().
And X-Accel-Redirect handling now does not call
ngx_http_upstream_finalize_request(NGX_DECLINED) if no cleanup handler
is installed.
Reported by Jiří Setnička
(https://mailman.nginx.org/pipermail/nginx-devel/2024-February/HWLYHOO3DDB3XTFT6X3GRMXIEJ3SJRUA.html).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 20 Feb 2024 01:23:43 +0300 |
parents | 7a07724256c2 |
children |
line wrap: on
line source
/* * Copyright (C) Nginx, Inc. */ #include <ngx_config.h> #include <ngx_core.h> #define NGX_BPF_LOGBUF_SIZE (16 * 1024) static ngx_inline int ngx_bpf(enum bpf_cmd cmd, union bpf_attr *attr, unsigned int size) { return syscall(__NR_bpf, cmd, attr, size); } void ngx_bpf_program_link(ngx_bpf_program_t *program, const char *symbol, int fd) { ngx_uint_t i; ngx_bpf_reloc_t *rl; rl = program->relocs; for (i = 0; i < program->nrelocs; i++) { if (ngx_strcmp(rl[i].name, symbol) == 0) { program->ins[rl[i].offset].src_reg = 1; program->ins[rl[i].offset].imm = fd; } } } int ngx_bpf_load_program(ngx_log_t *log, ngx_bpf_program_t *program) { int fd; union bpf_attr attr; #if (NGX_DEBUG) char buf[NGX_BPF_LOGBUF_SIZE]; #endif ngx_memzero(&attr, sizeof(union bpf_attr)); attr.license = (uintptr_t) program->license; attr.prog_type = program->type; attr.insns = (uintptr_t) program->ins; attr.insn_cnt = program->nins; #if (NGX_DEBUG) /* for verifier errors */ attr.log_buf = (uintptr_t) buf; attr.log_size = NGX_BPF_LOGBUF_SIZE; attr.log_level = 1; #endif fd = ngx_bpf(BPF_PROG_LOAD, &attr, sizeof(attr)); if (fd < 0) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "failed to load BPF program"); ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "bpf verifier: %s", buf); return -1; } return fd; } int ngx_bpf_map_create(ngx_log_t *log, enum bpf_map_type type, int key_size, int value_size, int max_entries, uint32_t map_flags) { int fd; union bpf_attr attr; ngx_memzero(&attr, sizeof(union bpf_attr)); attr.map_type = type; attr.key_size = key_size; attr.value_size = value_size; attr.max_entries = max_entries; attr.map_flags = map_flags; fd = ngx_bpf(BPF_MAP_CREATE, &attr, sizeof(attr)); if (fd < 0) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "failed to create BPF map"); return NGX_ERROR; } return fd; } int ngx_bpf_map_update(int fd, const void *key, const void *value, uint64_t flags) { union bpf_attr attr; ngx_memzero(&attr, sizeof(union bpf_attr)); attr.map_fd = fd; attr.key = (uintptr_t) key; attr.value = (uintptr_t) value; attr.flags = flags; return ngx_bpf(BPF_MAP_UPDATE_ELEM, &attr, sizeof(attr)); } int ngx_bpf_map_delete(int fd, const void *key) { union bpf_attr attr; ngx_memzero(&attr, sizeof(union bpf_attr)); attr.map_fd = fd; attr.key = (uintptr_t) key; return ngx_bpf(BPF_MAP_DELETE_ELEM, &attr, sizeof(attr)); } int ngx_bpf_map_lookup(int fd, const void *key, void *value) { union bpf_attr attr; ngx_memzero(&attr, sizeof(union bpf_attr)); attr.map_fd = fd; attr.key = (uintptr_t) key; attr.value = (uintptr_t) value; return ngx_bpf(BPF_MAP_LOOKUP_ELEM, &attr, sizeof(attr)); }