Mercurial > hg > nginx
annotate src/os/unix/ngx_sunpro_x86.il @ 9322:d6f75dd66761 default tip
Mp4: added and updated sanity checks for "end" handling.
When handling incorrect data in ngx_http_mp4_crop_stsc_data(),
trak->end_chunk_samples might end up being arbitrary large, leading
to reading before the buffer in ngx_http_mp4_update_stsz_atom(). Fix
is to check that trak->end_chunk_samples corresponds to a memory within
the stsz atom data. For consistency, trak->start_chunk_samples
is checked similarly.
Similarly, trak->end_chunk might end up being smaller than trak->start_chunk,
leading to reading memory after the buffer in ngx_http_mp4_update_stco_atom()
and ngx_http_mp4_update_co64_atom(). Corresponding checks are updated
to explicitly test (trak->end_chunk - trak->start_chunk) instead of just
checking trak->end_chunk and assuming it is larger than trak->start_chunk.
This is generally in line with existing checks of
(trak->end_sample - trak->start_sample) in ngx_http_mp4_update_stsz_atom(),
where trak->end_sample might also become smaller than trak->start_sample
when handling incorrect data in ngx_http_mp4_crop_stts_data().
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sun, 25 Aug 2024 06:35:40 +0300 |
parents | 2cd019520210 |
children |
rev | line source |
---|---|
561 | 1 / |
2 / Copyright (C) Igor Sysoev | |
4412 | 3 / Copyright (C) Nginx, Inc. |
561 | 4 / |
5 | |
6 / ngx_atomic_uint_t ngx_atomic_cmp_set(ngx_atomic_t *lock, | |
7 / ngx_atomic_uint_t old, ngx_atomic_uint_t set); | |
8 / | |
2818
7e02df612521
preserve Solaris binary hardware capabilities
Igor Sysoev <igor@sysoev.ru>
parents:
1309
diff
changeset
|
9 / the arguments are passed on stack (%esp), 4(%esp), 8(%esp) |
561 | 10 |
11 .inline ngx_atomic_cmp_set,0 | |
12 movl (%esp), %ecx | |
13 movl 4(%esp), %eax | |
14 movl 8(%esp), %edx | |
15 lock | |
16 cmpxchgl %edx, (%ecx) | |
17 setz %al | |
18 movzbl %al, %eax | |
19 .end | |
20 | |
21 | |
22 / ngx_atomic_int_t ngx_atomic_fetch_add(ngx_atomic_t *value, | |
23 / ngx_atomic_int_t add); | |
24 / | |
2818
7e02df612521
preserve Solaris binary hardware capabilities
Igor Sysoev <igor@sysoev.ru>
parents:
1309
diff
changeset
|
25 / the arguments are passed on stack (%esp), 4(%esp) |
561 | 26 |
27 .inline ngx_atomic_fetch_add,0 | |
28 movl (%esp), %ecx | |
29 movl 4(%esp), %eax | |
30 lock | |
31 xaddl %eax, (%ecx) | |
32 .end | |
1309 | 33 |
34 | |
35 / ngx_cpu_pause() | |
2818
7e02df612521
preserve Solaris binary hardware capabilities
Igor Sysoev <igor@sysoev.ru>
parents:
1309
diff
changeset
|
36 / |
7e02df612521
preserve Solaris binary hardware capabilities
Igor Sysoev <igor@sysoev.ru>
parents:
1309
diff
changeset
|
37 / the "rep; nop" is used instead of "pause" to avoid the "[ PAUSE ]" hardware |
7e02df612521
preserve Solaris binary hardware capabilities
Igor Sysoev <igor@sysoev.ru>
parents:
1309
diff
changeset
|
38 / capability added by linker because Solaris/i386 does not know about it: |
7e02df612521
preserve Solaris binary hardware capabilities
Igor Sysoev <igor@sysoev.ru>
parents:
1309
diff
changeset
|
39 / |
7e02df612521
preserve Solaris binary hardware capabilities
Igor Sysoev <igor@sysoev.ru>
parents:
1309
diff
changeset
|
40 / ld.so.1: nginx: fatal: hardware capability unsupported: 0x2000 [ PAUSE ] |
1309 | 41 |
6474 | 42 .inline ngx_cpu_pause,0 |
43 rep; nop | |
44 .end |