Commit a3bfa88
committed
extra: restore the hardening sysctls immediately on a trapped signal
A shell defers a trapped signal until the current foreground command
finishes, and weaken-kernel-hardening held its relaxed state in a
`sleep 86400` loop. A SIGTERM therefore left kptr_restrict,
dmesg_restrict, perf_event_paranoid and unprivileged_bpf_disabled at 0
for up to a day, host-wide rather than for the testing process alone,
and SIGHUP was not trapped at all, so closing the terminal never
restored them. Run the sleep in the background with the shell blocked in
`wait`, which the signal interrupts, and add HUP to the trap list.
restore() disarms the traps before running, so the exit that follows a
signal no longer restores a second time. sudo-proc-kallsyms takes the
same trap fix for its shorter kptr_restrict window, and both scripts
record that the sysctls they touch are system-wide.
The README claimed the weakened state never outlives the process; it now
names the signals that restore and states that SIGKILL cannot be
trapped.1 parent 1a325f4 commit a3bfa88
3 files changed
Lines changed: 28 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
71 | | - | |
72 | | - | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
73 | 76 | | |
74 | 77 | | |
75 | 78 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
12 | 16 | | |
13 | 17 | | |
14 | 18 | | |
| |||
23 | 27 | | |
24 | 28 | | |
25 | 29 | | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
26 | 33 | | |
27 | 34 | | |
28 | 35 | | |
| |||
31 | 38 | | |
32 | 39 | | |
33 | 40 | | |
34 | | - | |
| 41 | + | |
35 | 42 | | |
36 | 43 | | |
37 | 44 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
6 | 9 | | |
7 | 10 | | |
8 | 11 | | |
| |||
55 | 58 | | |
56 | 59 | | |
57 | 60 | | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
58 | 64 | | |
59 | 65 | | |
60 | 66 | | |
| |||
68 | 74 | | |
69 | 75 | | |
70 | 76 | | |
71 | | - | |
| 77 | + | |
72 | 78 | | |
73 | 79 | | |
74 | 80 | | |
| |||
103 | 109 | | |
104 | 110 | | |
105 | 111 | | |
106 | | - | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
107 | 117 | | |
108 | | - | |
| 118 | + | |
| 119 | + | |
109 | 120 | | |
0 commit comments