Skip to content

Commit 48dd893

Browse files
committed
bump custom-docker-with-unrestricted-personality.patch to Debian 13
1 parent 2b2e271 commit 48dd893

2 files changed

Lines changed: 60 additions & 66 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ docker run -it --security-opt seccomp:unconfined termux/termux-docker:aarch64
7171
Variant with custom build of Docker:
7272

7373
> [!NOTE]
74-
> Example with Debian bookworm `armhf` host and the `docker.io` package. Assumes that [`deb-src` URIs](https://wiki.debian.org/Packaging/SourcePackage?action=show&redirect=SourcePackage#With_apt-get_source) and the [`devscripts` package](https://wiki.debian.org/Packaging#Suggested_tools_to_create_an_environment_for_packaging) are already installed, and that the current user is a member of the `docker` group.
74+
> Example with Debian trixie `armhf` host and the `docker.io` package. Assumes that [`deb-src` URIs](https://wiki.debian.org/Packaging/SourcePackage?action=show&redirect=SourcePackage#With_apt-get_source) and the [`devscripts` package](https://wiki.debian.org/Packaging#Suggested_tools_to_create_an_environment_for_packaging) are already installed, and that the current user is a member of the `docker` group.
7575
7676
```.sh
7777
sudo apt build-dep docker.io

custom-docker-with-unrestricted-personality.patch

Lines changed: 59 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
This removes all restrictions from the personality() system call from within Docker, and
22
is only necessary on some specific devices, including some ARM devices but not all ARM devices,
33
and only when the --privileged and --security-opt arguments are either not working or not desired,
4-
which sometimes happens. This patch is designed for the docker.io package version 20.10.24 in
5-
Debian bookworm: https://packages.debian.org/bookworm/docker.io, but also works when rebased on other
4+
which sometimes happens. This patch is designed for the docker.io package version 26.1.5 in
5+
Debian trixie: https://packages.debian.org/trixie/docker.io, but also works when rebased on other
66
versions of Docker.
77

88
--- a/engine/oci/fixtures/default-old-format.json
@@ -135,7 +135,7 @@ versions of Docker.
135135
"excludes": {}
136136
--- a/engine/profiles/seccomp/default.json
137137
+++ b/engine/profiles/seccomp/default.json
138-
@@ -422,77 +422,7 @@
138+
@@ -441,65 +441,7 @@
139139
"personality"
140140
],
141141
"action": "SCMP_ACT_ALLOW",
@@ -145,10 +145,7 @@ versions of Docker.
145145
- "value": 0,
146146
- "op": "SCMP_CMP_EQ"
147147
- }
148-
- ],
149-
- "comment": "",
150-
- "includes": {},
151-
- "excludes": {}
148+
- ]
152149
- },
153150
- {
154151
- "names": [
@@ -161,10 +158,7 @@ versions of Docker.
161158
- "value": 8,
162159
- "op": "SCMP_CMP_EQ"
163160
- }
164-
- ],
165-
- "comment": "",
166-
- "includes": {},
167-
- "excludes": {}
161+
- ]
168162
- },
169163
- {
170164
- "names": [
@@ -177,10 +171,7 @@ versions of Docker.
177171
- "value": 131072,
178172
- "op": "SCMP_CMP_EQ"
179173
- }
180-
- ],
181-
- "comment": "",
182-
- "includes": {},
183-
- "excludes": {}
174+
- ]
184175
- },
185176
- {
186177
- "names": [
@@ -193,10 +184,7 @@ versions of Docker.
193184
- "value": 131080,
194185
- "op": "SCMP_CMP_EQ"
195186
- }
196-
- ],
197-
- "comment": "",
198-
- "includes": {},
199-
- "excludes": {}
187+
- ]
200188
- },
201189
- {
202190
- "names": [
@@ -209,72 +197,79 @@ versions of Docker.
209197
- "value": 4294967295,
210198
- "op": "SCMP_CMP_EQ"
211199
- }
212-
- ],
213-
+ "args": [],
214-
"comment": "",
215-
"includes": {},
216-
"excludes": {}
200+
- ]
201+
+ "args": []
202+
},
203+
{
204+
"names": [
217205
--- a/engine/profiles/seccomp/default_linux.go
218206
+++ b/engine/profiles/seccomp/default_linux.go
219-
@@ -424,57 +424,7 @@ func DefaultProfile() *Seccomp {
220-
{
221-
Names: []string{"personality"},
222-
Action: specs.ActAllow,
223-
- Args: []*specs.LinuxSeccompArg{
224-
- {
225-
- Index: 0,
226-
- Value: 0x0,
227-
- Op: specs.OpEqualTo,
207+
@@ -435,65 +435,6 @@ func DefaultProfile() *Seccomp {
208+
LinuxSyscall: specs.LinuxSyscall{
209+
Names: []string{"personality"},
210+
Action: specs.ActAllow,
211+
- Args: []specs.LinuxSeccompArg{
212+
- {
213+
- Index: 0,
214+
- Value: 0x0,
215+
- Op: specs.OpEqualTo,
216+
- },
228217
- },
229218
- },
230219
- },
231220
- {
232-
- Names: []string{"personality"},
233-
- Action: specs.ActAllow,
234-
- Args: []*specs.LinuxSeccompArg{
235-
- {
236-
- Index: 0,
237-
- Value: 0x0008,
238-
- Op: specs.OpEqualTo,
221+
- LinuxSyscall: specs.LinuxSyscall{
222+
- Names: []string{"personality"},
223+
- Action: specs.ActAllow,
224+
- Args: []specs.LinuxSeccompArg{
225+
- {
226+
- Index: 0,
227+
- Value: 0x0008,
228+
- Op: specs.OpEqualTo,
229+
- },
239230
- },
240231
- },
241232
- },
242233
- {
243-
- Names: []string{"personality"},
244-
- Action: specs.ActAllow,
245-
- Args: []*specs.LinuxSeccompArg{
246-
- {
247-
- Index: 0,
248-
- Value: 0x20000,
249-
- Op: specs.OpEqualTo,
234+
- LinuxSyscall: specs.LinuxSyscall{
235+
- Names: []string{"personality"},
236+
- Action: specs.ActAllow,
237+
- Args: []specs.LinuxSeccompArg{
238+
- {
239+
- Index: 0,
240+
- Value: 0x20000,
241+
- Op: specs.OpEqualTo,
242+
- },
250243
- },
251244
- },
252245
- },
253246
- {
254-
- Names: []string{"personality"},
255-
- Action: specs.ActAllow,
256-
- Args: []*specs.LinuxSeccompArg{
257-
- {
258-
- Index: 0,
259-
- Value: 0x20008,
260-
- Op: specs.OpEqualTo,
247+
- LinuxSyscall: specs.LinuxSyscall{
248+
- Names: []string{"personality"},
249+
- Action: specs.ActAllow,
250+
- Args: []specs.LinuxSeccompArg{
251+
- {
252+
- Index: 0,
253+
- Value: 0x20008,
254+
- Op: specs.OpEqualTo,
255+
- },
261256
- },
262257
- },
263258
- },
264259
- {
265-
- Names: []string{"personality"},
266-
- Action: specs.ActAllow,
267-
- Args: []*specs.LinuxSeccompArg{
268-
- {
269-
- Index: 0,
270-
- Value: 0xffffffff,
271-
- Op: specs.OpEqualTo,
260+
- LinuxSyscall: specs.LinuxSyscall{
261+
- Names: []string{"personality"},
262+
- Action: specs.ActAllow,
263+
- Args: []specs.LinuxSeccompArg{
264+
- {
265+
- Index: 0,
266+
- Value: 0xffffffff,
267+
- Op: specs.OpEqualTo,
268+
- },
272269
- },
273-
- },
274-
+ Args: []*specs.LinuxSeccompArg{},
270+
},
275271
},
276272
{
277-
Names: []string{
278273
--- a/engine/profiles/seccomp/fixtures/default-old-format.json
279274
+++ b/engine/profiles/seccomp/fixtures/default-old-format.json
280275
@@ -824,38 +824,7 @@
@@ -317,4 +312,3 @@ versions of Docker.
317312
},
318313
{
319314
"name": "pipe",
320-

0 commit comments

Comments
 (0)