Skip to content

Commit a8a5df4

Browse files
authored
Merge branch 'master' into master
2 parents 0b88423 + 0773c42 commit a8a5df4

File tree

11 files changed

+19
-18
lines changed

11 files changed

+19
-18
lines changed

.github/workflows/gemini-pr-review.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
name: '🧐 Gemini Pull Request Review'
77

88
on:
9-
pull_request:
10-
types:
11-
- 'opened'
12-
- 'reopened'
9+
# Pull requests created from the forks doesn't have access to secrets. Disabling this trigger.
10+
# pull_request:
11+
# types:
12+
# - 'opened'
13+
# - 'reopened'
1314
issue_comment:
1415
types:
1516
- 'created'

docs/freebsd/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,4 +227,4 @@ If something does not work, try adding the `-debug` flag to `syz-manager`.
227227
- We should provide instructions for fuzzing a FreeBSD system on ZFS
228228
- `pkg/host` needs to be taught how to detect supported syscalls/devices.
229229
- KASAN and KCSAN for FreeBSD would be useful.
230-
- On Linux we have emission of exernal networking/USB traffic into kernel using tun/gadgetfs. Implementing these for FreeBSD could uncover a number of high-profile bugs.
230+
- On Linux we have emission of external networking/USB traffic into kernel using tun/gadgetfs. Implementing these for FreeBSD could uncover a number of high-profile bugs.

docs/freebsd/found_bugs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Newer bugs come first
3232
- [Fix an off-by-one error in the input validation of the SCTP_RESET_STREAMS socketoption.](https://reviews.freebsd.org/rS343769)
3333
- [Limit the user-controllable amount of memory the kernel allocates via IPPROTO_SCTP level socket options.](https://reviews.freebsd.org/rS343089)
3434
- [Fix getsockopt() for IP_OPTIONS/IP_RETOPTS.](https://reviews.freebsd.org/rS342879)
35-
- [Avoid overfow in vtruncbuf().](https://reviews.freebsd.org/rS342857)
35+
- [Avoid overflow in vtruncbuf().](https://reviews.freebsd.org/rS342857)
3636
- [Limit option_len for the TCP_CCALGOOPT.](https://reviews.freebsd.org/rS341335)
3737
- [Correct vm_fault_copy_entry() handling of backing file truncation after the file mapping was wired.](https://reviews.freebsd.org/rS338999)
3838
- [In vm_fault_copy_entry(), we should not assert that entry is charged if the dst_object is not of swap type.](https://reviews.freebsd.org/rS338998)

docs/internals.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ red labels indicate corresponding configuration options.
1919
It runs on a host with a stable kernel which does not experience white-noise fuzzer load.
2020

2121
`syz-manager` starts `syz-executor` processes (one inside each VM).
22-
`syz-executor`s comminucate with `syz-manager` over RPC to receive the programs
22+
`syz-executor`s communicate with `syz-manager` over RPC to receive the programs
2323
that must be executed and to report back the results (error statuses, collected coverage, etc.).
2424

2525
To execute programs, `syz-executor` starts transient subprocesses.

docs/linux/setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Make sure that your GCC meets this requirement, or get a GCC that [syzbot](/docs
6666
### Linux Kernel
6767

6868
Besides coverage support in GCC, you also need support for it on the kernel side.
69-
KCOV was added into mainline Linux kernel in version 4.6 and is be enabled by `CONFIG_KCOV=y` kernel configation option.
69+
KCOV was added into mainline Linux kernel in version 4.6 and is be enabled by `CONFIG_KCOV=y` kernel configuration option.
7070
For older kernels you need to at least backport commit [kernel: add kcov code coverage](https://github.com/torvalds/linux/commit/5c9a8750a6409c63a0f01d51a9024861022f6593).
7171
Besides that, it's recommended to backport all kernel patches that touch `kernel/kcov.c`.
7272

docs/linux/setup_linux-host_qemu-vm_arm64-kernel.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Choose the following options.
3232

3333
Run `make`. After the build, confirm that `output/images/rootfs.ext3` exists.
3434

35-
If you're expreriencing a very slow sshd start up time with arm64 qemu running on x86, the reason is probably low entropy and it be "fixed" with installing `haveged`. It can be found in the buildroot `menuconfig`:
35+
If you're experiencing a very slow sshd start up time with arm64 qemu running on x86, the reason is probably low entropy and it be "fixed" with installing `haveged`. It can be found in the buildroot `menuconfig`:
3636

3737
```
3838
Target packages

docs/linux/setup_linux-host_qemu-vm_riscv64-kernel.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ make ARCH=riscv CROSS_COMPILE=riscv64-linux-gnu- -j $(nproc)
2525

2626
# OpenSBI
2727

28-
Clone the OpenSBI repository and build the bootable OpenSBI image containg the kernel:
28+
Clone the OpenSBI repository and build the bootable OpenSBI image containing the kernel:
2929

3030
```shell
3131
git clone https://github.com/riscv/opensbi

docs/maintaining.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Pull requests (PR) have only 2 options:
1818
`cla/google` check needs to pass before merging.
1919

2020
CI testing generally needs to pass before merging.\
21-
Exceptions may be infrastrcture flakes (especially in external services: `codecov`, `ci/fuzzit`);
21+
Exceptions may be infrastructure flakes (especially in external services: `codecov`, `ci/fuzzit`);
2222
one-off timeouts/OOMs (but not if this PR itself makes them much more frequent).
2323
All static checking warnings and testing errors are considered hard errors.
2424

@@ -28,12 +28,12 @@ Adding tests for new code and bug fixes is generally encouraged. Ask contributor
2828

2929
However, some code is easier to test, while some is harder. Some examples of cases where
3030
it's easier to add tests (should be added): abstract functionalities without external dependencies
31-
(e.g. parsers, data transformations, calculations); code with established testing infrastrcture
31+
(e.g. parsers, data transformations, calculations); code with established testing infrastructure
3232
(adding new tests is just adding one more of the same). Examples of cases where it's harder
3333
to add tests (may be not added, but still welcome if one wants to go above and beyond):
34-
code with external dependancies that are not easy to fake out (qemu, kernel, image, etc);
35-
code without established testing infrastrcture where adding one test would require building
36-
the whole infrastrcture first.
34+
code with external dependencies that are not easy to fake out (qemu, kernel, image, etc);
35+
code without established testing infrastructure where adding one test would require building
36+
the whole infrastructure first.
3737

3838
## Use your judgement
3939

docs/openbsd/found_bugs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ Newer bugs comes first.
216216

217217
- [ioctl: reject inappropriate commands in `wsmux_do_ioctl()`](https://marc.info/?l=openbsd-cvs&m=154507410803526&w=2)
218218

219-
- [getsockopt: errorneous switch fall through in `rip_usrreq()` affecting many socket related syscalls](https://marc.info/?l=openbsd-cvs&m=154383186000797&w=2)
219+
- [getsockopt: erroneous switch fall through in `rip_usrreq()` affecting many socket related syscalls](https://marc.info/?l=openbsd-cvs&m=154383186000797&w=2)
220220

221221
- [shutdown: integer overflow in `unp_internalize()`](https://marc.info/?l=openbsd-cvs&m=154282004307882&w=2) [ERRATA-64-006](https://ftp.openbsd.org/pub/OpenBSD/patches/6.4/common/006_uipc.patch.sig)
222222

docs/openbsd/gce.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ci-openbsd host
22

3-
OpenBSD continous integration build machine has two disks. The root image is
3+
OpenBSD continuous integration build machine has two disks. The root image is
44
generated by `tools/create-openbsd-gce-ci.sh`. This disk is disposable and will
55
be rebuilt when compatibility bumps in OpenBSD-current are encountered. Manual
66
tweaks to this image without updating the script will be lost.

0 commit comments

Comments
 (0)