Skip to content

Commit

Permalink
Merge pull request #227 from philwo/philwo-1
Browse files Browse the repository at this point in the history
Fix typo (SIKGILL -> SIGKILL)
  • Loading branch information
robertswiecki authored Nov 19, 2023
2 parents 3ff69c0 + 727caf9 commit 3d9a5b2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ The command-line options should be self-explanatory, while the proto-buf config
--disable_tsc
Disable rdtsc and rdtscp instructions. WARNING: To make it effective, you also need to forbid `prctl(PR_SET_TSC, PR_TSC_ENABLE, ...)` in seccomp rules! (x86 and x86_64 only). Dynamic binaries produced by GCC seem to rely on RDTSC, but static ones should work.
--forward_signals
Forward fatal signals to the child process instead of always using SIKGILL.
Forward fatal signals to the child process instead of always using SIGKILL.

Examples:
Wait on a port 31337 for connections, and run /bin/sh
Expand Down
2 changes: 1 addition & 1 deletion cmdline.cc
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ static const struct custom_option custom_opts[] = {
{ { "macvlan_vs_ma", required_argument, nullptr, 0x705 }, "MAC-address of the 'vs' interface (e.g. \"ba:ad:ba:be:45:00\")" },
{ { "macvlan_vs_mo", required_argument, nullptr, 0x706 }, "Mode of the 'vs' interface. Can be either 'private', 'vepa', 'bridge' or 'passthru' (default: 'private')" },
{ { "disable_tsc", no_argument, nullptr, 0x707 }, "Disable rdtsc and rdtscp instructions. WARNING: To make it effective, you also need to forbid `prctl(PR_SET_TSC, PR_TSC_ENABLE, ...)` in seccomp rules! (x86 and x86_64 only). Dynamic binaries produced by GCC seem to rely on RDTSC, but static ones should work." },
{ { "forward_signals", no_argument, nullptr, 0x708 }, "Forward fatal signals to the child process instead of always using SIKGILL." },
{ { "forward_signals", no_argument, nullptr, 0x708 }, "Forward fatal signals to the child process instead of always using SIGKILL." },
};
// clang-format on

Expand Down

0 comments on commit 3d9a5b2

Please sign in to comment.