Repository navigation
Commit 6596741
committed
Report program data shorter than its header says as InvalidProgram
Program::load reads the 64 header bytes, and then the program, whose size
the header states. When the data is shorter than either, the read fails
inside the data loader, and the loader's error comes through instead, for
example InvalidArgument from BufferDataLoader, although the cause is a
malformed program. The program size is already checked against the data
for most headers, but not for headers written before segment_data_size
existed.
When the loader reports its size, Program::load now checks both lengths
against it first and returns InvalidProgram. The program size from the
header is compared as the 64-bit value it is stored as, before it is
narrowed to size_t. Program::load now asks the loader for its size once,
and returns the loader's error where it used to abort on a failed size
query. A loader that cannot report its size still loads programs whose
header does not need it, as before.
This changes an error code. Code that expected the loader's error for such
truncated program data should expect InvalidProgram. BundledModule with a
file that is not a bundled program is one such case, so
BundledModuleTest.TestNonBPFile now expects InvalidProgram.1 parent 25bb87a commit 6596741
3 files changed
Lines changed: 80 additions & 7 deletions
File tree
- extension/module/test
- runtime/executor
- test
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
| 58 | + | |
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
62 | | - | |
| 62 | + | |
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
79 | 79 | | |
80 | 80 | | |
81 | 81 | | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
82 | 85 | | |
83 | 86 | | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
84 | 93 | | |
85 | 94 | | |
86 | 95 | | |
| |||
91 | 100 | | |
92 | 101 | | |
93 | 102 | | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
94 | 111 | | |
95 | 112 | | |
96 | 113 | | |
| |||
110 | 127 | | |
111 | 128 | | |
112 | 129 | | |
113 | | - | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
114 | 134 | | |
115 | 135 | | |
116 | 136 | | |
| |||
121 | 141 | | |
122 | 142 | | |
123 | 143 | | |
124 | | - | |
125 | | - | |
126 | | - | |
| 144 | + | |
| 145 | + | |
127 | 146 | | |
128 | | - | |
| 147 | + | |
129 | 148 | | |
130 | 149 | | |
131 | 150 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
625 | 625 | | |
626 | 626 | | |
627 | 627 | | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
| 631 | + | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
| 653 | + | |
| 654 | + | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
| 660 | + | |
| 661 | + | |
| 662 | + | |
| 663 | + | |
| 664 | + | |
| 665 | + | |
| 666 | + | |
| 667 | + | |
| 668 | + | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
| 674 | + | |
| 675 | + | |
| 676 | + | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
628 | 682 | | |
629 | 683 | | |
630 | 684 | | |
| |||
0 commit comments