1
Author: John Johansen <john.johansen@canonical.com>
2
Origin: https://lists.ubuntu.com/archives/apparmor/2014-March/005581.html
3
Subject: Update test scripts for new signal and ptrace semantics
5
The previous test patches where done with the hardcoded bypass for
8
This semantic was changed so that a confined app can now block unconfined
9
processes from tracing or sending signals to it.
13
Index: ipc-fixes-and-improvements/tests/regression/apparmor/dbus.inc
14
===================================================================
15
--- ipc-fixes-and-improvements.orig/tests/regression/apparmor/dbus.inc 2014-03-30 09:48:03.720238309 -0500
16
+++ ipc-fixes-and-improvements/tests/regression/apparmor/dbus.inc 2014-03-30 09:48:03.708238308 -0500
17
@@ -14,6 +14,7 @@ ${__dbus_var_decl}
21
+ signal receive peer=unconfined,
25
Index: ipc-fixes-and-improvements/tests/regression/apparmor/exec_qual.sh
26
===================================================================
27
--- ipc-fixes-and-improvements.orig/tests/regression/apparmor/exec_qual.sh 2014-03-30 09:48:03.720238309 -0500
28
+++ ipc-fixes-and-improvements/tests/regression/apparmor/exec_qual.sh 2014-03-30 09:48:03.708238308 -0500
29
@@ -72,28 +72,28 @@ local_runchecktest()
30
# child profile grants access
31
# expected behaviour: child should be able to access resource
33
-genprofile $test2:px $file:$fileperm -- image=$test2 $file:$fileperm
34
+genprofile $test2:px $file:$fileperm signal:receive:peer=unconfined -- image=$test2 $file:$fileperm signal:receive
35
local_runchecktest "enforce px case1" pass $test2 $test2 $file
37
# case 2: parent profile grants access (should be irrelevant)
38
# child profile disallows access
39
# expected behaviour: child should be unable to access resource
41
-genprofile $test2:px $file:$fileperm -- image=$test2
42
+genprofile $test2:px $file:$fileperm signal:receive:peer=unconfined -- image=$test2 signal:receive
43
local_runchecktest "enforce px case2" fail $test2 $test2 $file
45
# case 3: parent profile disallows access (should be irrelevant)
46
# child profile allows access
47
# expected behaviour: child should be able to access resource
49
-genprofile $test2:px -- image=$test2 $file:$fileperm
50
+genprofile $test2:px signal:receive:peer=unconfined -- image=$test2 $file:$fileperm signal:receive
51
local_runchecktest "enforce px case3" pass $test2 $test2 $file
53
# case 4: parent profile grants access (should be irrelevant)
54
# missing child profile
55
# expected behaviour: exec of child fails
57
-genprofile $test2:px $file:$fileperm
58
+genprofile $test2:px $file:$fileperm signal:receive:peer=unconfined
59
local_runchecktest "enforce px case4" fail "n/a" $test2 $file
61
# confined parent, exec child with 'ix'
62
@@ -101,41 +101,41 @@ local_runchecktest "enforce px case4" fa
63
# child profile grants access (should be irrelevant)
64
# expected behaviour: child should be able to access resource
66
-genprofile $test2:rix $file:$fileperm -- image=$test2 $file:$fileperm
67
+genprofile $test2:rix $file:$fileperm signal:receive:peer=unconfined -- image=$test2 $file:$fileperm signal:receive
68
local_runchecktest "enforce ix case1" pass $test1 $test2 $file
70
# case 2: parent profile grants access
71
# child profile disallows access (should be irrelevant)
72
# expected behaviour: child should be able to access resource
74
-genprofile $test2:rix $file:$fileperm -- image=$test2
75
+genprofile $test2:rix $file:$fileperm signal:receive:peer=unconfined -- image=$test2 signal:receive
76
local_runchecktest "enforce ix case2" pass $test1 $test2 $file
78
# case 3: parent profile disallows access
79
# child profile allows access (should be irrelevant)
80
# expected behaviour: child should be unable to access resource
82
-genprofile $test2:rix -- image=$test2 $file:$fileperm
83
+genprofile $test2:rix signal:receive:peer=unconfined -- image=$test2 $file:$fileperm signal:receive
84
local_runchecktest "enforce ix case3" fail $test1 $test2 $file
86
# case 4: parent profile grants access
87
# missing child profile (irrelvant)
88
# expected behaviour: child should be able to access resource
90
-genprofile $test2:rix $file:$fileperm
91
+genprofile $test2:rix $file:$fileperm signal:receive:peer=unconfined
92
local_runchecktest "enforce ix case4" pass $test1 $test2 $file
94
# confined parent, exec child with 'ux'
95
# case 1: parent profile grants access (should be irrelevant)
96
# expected behaviour, child should be able to access resource
98
-genprofile $test2:ux $file:$fileperm
99
+genprofile $test2:ux $file:$fileperm signal:receive:peer=unconfined
100
local_runchecktest "enforce ux case1" pass "unconfined" $test2 $file
102
# case 2: parent profile denies access (should be irrelevant)
103
# expected behaviour, child should be able to access resource
105
-genprofile $test2:ux
106
+genprofile $test2:ux signal:receive:peer=unconfined
107
local_runchecktest "enforce ux case1" pass "unconfined" $test2 $file
109
# confined parent, exec child with conflicting exec qualifiers
110
@@ -144,20 +144,20 @@ local_runchecktest "enforce ux case1" pa
112
# expected behaviour: exec of child passes
114
-genprofile $test2:px $test2_rex1:ix -- image=$test2 $file:$fileperm
115
+genprofile $test2:px $test2_rex1:ix signal:receive:peer=unconfined -- image=$test2 $file:$fileperm signal:receive
116
local_runchecktest "enforce conflicting exec qual" pass $test2 $test2 $file
119
# case 1: child profile exists, child profile grants access
120
# expected behaviour: child should be able to access resource
122
-genprofile image=$test2 $file:$fileperm
123
+genprofile image=$test2 $file:$fileperm signal:receive:peer=unconfined
124
local_runchecktest "enforce unconfined case1" pass $test2 $test2 $file
126
# case 2: child profile exists, child profile denies access
127
# expected behaviour: child should be unable to access resource
129
-genprofile image=$test2
130
+genprofile image=$test2 signal:receive:peer=unconfined
131
local_runchecktest "enforce unconfined case2" fail $test2 $test2 $file
133
# case 3: no child profile exists, unconfined
134
Index: ipc-fixes-and-improvements/tests/regression/apparmor/mmap.sh
135
===================================================================
136
--- ipc-fixes-and-improvements.orig/tests/regression/apparmor/mmap.sh 2014-03-30 09:48:03.720238309 -0500
137
+++ ipc-fixes-and-improvements/tests/regression/apparmor/mmap.sh 2014-03-30 09:48:03.708238308 -0500
138
@@ -29,7 +29,7 @@ badperm=r
142
-genprofile $file:$okperm
143
+genprofile $file:$okperm signal:receive:peer=unconfined
145
runtestbg "READ/WRITE pass1" pass $file
147
@@ -47,13 +47,13 @@ rm -f $file
149
# FAILURE TEST (pt 1)
151
-genprofile $file:$okperm
152
+genprofile $file:$okperm signal:receive:peer=unconfined
154
runtestbg "READ/WRITE pass2" pass $file
158
-genprofile $file:$badperm
159
+genprofile $file:$badperm signal:receive:peer=unconfined
161
# FAILURE TEST (pt 2)
163
Index: ipc-fixes-and-improvements/tests/regression/apparmor/ptrace_v6.inc
164
===================================================================
165
--- ipc-fixes-and-improvements.orig/tests/regression/apparmor/ptrace_v6.inc 2014-03-30 09:48:03.720238309 -0500
166
+++ ipc-fixes-and-improvements/tests/regression/apparmor/ptrace_v6.inc 2014-03-30 09:48:03.712238309 -0500
167
@@ -13,7 +13,7 @@ echo " using ptrace v6 tests ..."
169
#unconfined tracing confined helper
170
#confined helper asking unconfined process to ptrace it
171
-genprofile image=$helper signal:ALL
172
+genprofile image=$helper signal:ALL ptrace:tracedby:peer=unconfined
174
runchecktest "test 3 -h" pass -h -n 100 $helper
175
runchecktest "test 3 -hc " pass -h -c -n 100 $helper
176
@@ -212,14 +212,14 @@ runchecktest "test 12p -h" pass -h -n 10
177
runchecktest "test 12p -hc" pass -h -c -n 100 $helper
178
runchecktest "test 12p -h prog" pass -h -n 100 $helper /bin/true
179
runchecktest "test 12p -hc prog" pass -h -c -n 100 $helper /bin/true
180
-genprofile /bin/true:rix $helper:rix signal:ALL ptrace:$test
181
+genprofile /bin/true:rix $helper:rix signal:ALL ptrace:peer=$test
182
runchecktest "test 12p1" pass -n 100 /bin/true
183
runchecktest "test 12p1 -c" pass -c -n 100 /bin/true
184
runchecktest "test 12p1 -h" pass -h -n 100 $helper
185
runchecktest "test 12p1 -hc" pass -h -c -n 100 $helper
186
runchecktest "test 12p1 -h prog" pass -h -n 100 $helper /bin/true
187
runchecktest "test 12p1 -hc prog" pass -h -c -n 100 $helper /bin/true
188
-genprofile /bin/true:rix $helper:rix signal:ALL ptrace:notaprofile
189
+genprofile /bin/true:rix $helper:rix signal:ALL ptrace:peer=notaprofile
190
runchecktest "test 12p2" fail -n 100 /bin/true
191
runchecktest "test 12p2 -c" fail -c -n 100 /bin/true
192
runchecktest "test 12p2 -h" fail -h -n 100 $helper
193
@@ -229,137 +229,137 @@ runchecktest "test 12p2 -hc prog" fail -
196
#ptraced confined app traced by profile can px
197
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:/bin/true -- image=/bin/true /bin/true:rix
198
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:peer=/bin/true -- image=/bin/true /bin/true:rix
199
runchecktest "test 13p1 -h prog" fail -h -n 100 $helper /bin/true
200
runchecktest "test 13p2 -hc prog" fail -h -c -n 100 $helper /bin/true
201
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:/bin/true -- image=/bin/true /bin/true:rix ptrace:tracedby
202
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:peer=/bin/true -- image=/bin/true /bin/true:rix ptrace:tracedby
203
runchecktest "test 13p3 -h prog" pass -h -n 100 $helper /bin/true
204
runchecktest "test 13p4 -hc prog" pass -h -c -n 100 $helper /bin/true
205
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:/bin/true -- image=/bin/true /bin/true:rix ptrace:tracedby:$test
206
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:peer=/bin/true -- image=/bin/true /bin/true:rix ptrace:tracedby:peer=$test
207
runchecktest "test 13p5 -h prog" pass -h -n 100 $helper /bin/true
208
runchecktest "test 13p6 -hc prog" pass -h -c -n 100 $helper /bin/true
209
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:/bin/true -- image=/bin/true /bin/true:rix ptrace:tracedby:notaprofile
210
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:peer=/bin/true -- image=/bin/true /bin/true:rix ptrace:tracedby:peer=notaprofile
211
runchecktest "test 13p7 -h prog" fail -h -n 100 $helper /bin/true
212
runchecktest "test 13p8 -hc prog" fail -h -c -n 100 $helper /bin/true
213
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:/bin/true -- image=/bin/true /bin/true:rix ptrace:trace
214
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:peer=/bin/true -- image=/bin/true /bin/true:rix ptrace:trace
215
runchecktest "test 13p9 -h prog" fail -h -n 100 $helper /bin/true
216
runchecktest "test 13pa -hc prog" fail -h -c -n 100 $helper /bin/true
217
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:/bin/true -- image=/bin/true /bin/true:rix ptrace:trace:$test
218
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:peer=/bin/true -- image=/bin/true /bin/true:rix ptrace:trace:peer=$test
219
runchecktest "test 13pb -h prog" fail -h -n 100 $helper /bin/true
220
runchecktest "test 13pc -hc prog" fail -h -c -n 100 $helper /bin/true
221
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:/bin/true -- image=/bin/true /bin/true:rix ptrace:trace:notaprofile
222
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:peer=/bin/true -- image=/bin/true /bin/true:rix ptrace:trace:peer=notaprofile
223
runchecktest "test 13pd -h prog" fail -h -n 100 $helper /bin/true
224
runchecktest "test 13pe -hc prog" fail -h -c -n 100 $helper /bin/true
227
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:trace:/bin/true -- image=/bin/true /bin/true:rix
228
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:trace:peer=/bin/true -- image=/bin/true /bin/true:rix
229
runchecktest "test 13p11 -h prog" fail -h -n 100 $helper /bin/true
230
runchecktest "test 13p21 -hc prog" fail -h -c -n 100 $helper /bin/true
231
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:trace:/bin/true -- image=/bin/true /bin/true:rix ptrace:tracedby
232
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:trace:peer=/bin/true -- image=/bin/true /bin/true:rix ptrace:tracedby
233
runchecktest "test 13p31 -h prog" pass -h -n 100 $helper /bin/true
234
runchecktest "test 13p41 -hc prog" pass -h -c -n 100 $helper /bin/true
235
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:trace:/bin/true -- image=/bin/true /bin/true:rix ptrace:tracedby:$test
236
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:trace:peer=/bin/true -- image=/bin/true /bin/true:rix ptrace:tracedby:peer=$test
237
runchecktest "test 13p51 -h prog" pass -h -n 100 $helper /bin/true
238
runchecktest "test 13p61 -hc prog" pass -h -c -n 100 $helper /bin/true
239
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:trace:/bin/true -- image=/bin/true /bin/true:rix ptrace:tracedby:notaprofile
240
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:trace:peer=/bin/true -- image=/bin/true /bin/true:rix ptrace:tracedby:peer=notaprofile
241
runchecktest "test 13p71 -h prog" fail -h -n 100 $helper /bin/true
242
runchecktest "test 13p81 -hc prog" fail -h -c -n 100 $helper /bin/true
243
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:trace:/bin/true -- image=/bin/true /bin/true:rix ptrace:trace
244
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:trace:peer=/bin/true -- image=/bin/true /bin/true:rix ptrace:trace
245
runchecktest "test 13p91 -h prog" fail -h -n 100 $helper /bin/true
246
runchecktest "test 13pa1 -hc prog" fail -h -c -n 100 $helper /bin/true
247
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:trace:/bin/true -- image=/bin/true /bin/true:rix ptrace:trace:$test
248
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:trace:peer=/bin/true -- image=/bin/true /bin/true:rix ptrace:trace:peer=$test
249
runchecktest "test 13pb1 -h prog" fail -h -n 100 $helper /bin/true
250
runchecktest "test 13pc1 -hc prog" fail -h -c -n 100 $helper /bin/true
251
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:trace:/bin/true -- image=/bin/true /bin/true:rix ptrace:trace:notaprofile
252
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:trace:peer=/bin/true -- image=/bin/true /bin/true:rix ptrace:trace:peer=notaprofile
253
runchecktest "test 13pd1 -h prog" fail -h -n 100 $helper /bin/true
254
runchecktest "test 13pe1 -hc prog" fail -h -c -n 100 $helper /bin/true
257
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:ALL -- image=/bin/true /bin/true:rix
258
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:ALL -- image=/bin/true /bin/true:rix
259
runchecktest "test 13p12 -h prog" fail -h -n 100 $helper /bin/true
260
runchecktest "test 13p22 -hc prog" fail -h -c -n 100 $helper /bin/true
261
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:ALL -- image=/bin/true /bin/true:rix ptrace:tracedby
262
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:ALL -- image=/bin/true /bin/true:rix ptrace:tracedby
263
runchecktest "test 13p32 -h prog" pass -h -n 100 $helper /bin/true
264
runchecktest "test 13p42 -hc prog" pass -h -c -n 100 $helper /bin/true
265
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:ALL -- image=/bin/true /bin/true:rix ptrace:tracedby:$test
266
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:ALL -- image=/bin/true /bin/true:rix ptrace:tracedby:peer=$test
267
runchecktest "test 13p52 -h prog" pass -h -n 100 $helper /bin/true
268
runchecktest "test 13p62 -hc prog" pass -h -c -n 100 $helper /bin/true
269
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:ALL -- image=/bin/true /bin/true:rix ptrace:tracedby:notaprofile
270
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:ALL -- image=/bin/true /bin/true:rix ptrace:tracedby:peer=notaprofile
271
runchecktest "test 13p72 -h prog" fail -h -n 100 $helper /bin/true
272
runchecktest "test 13p82 -hc prog" fail -h -c -n 100 $helper /bin/true
273
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:ALL -- image=/bin/true /bin/true:rix ptrace:trace
274
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:ALL -- image=/bin/true /bin/true:rix ptrace:trace
275
runchecktest "test 13p92 -h prog" fail -h -n 100 $helper /bin/true
276
runchecktest "test 13pa2 -hc prog" fail -h -c -n 100 $helper /bin/true
277
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:ALL -- image=/bin/true /bin/true:rix ptrace:trace:$test
278
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:ALL -- image=/bin/true /bin/true:rix ptrace:trace:peer=$test
279
runchecktest "test 13pb2 -h prog" fail -h -n 100 $helper /bin/true
280
runchecktest "test 13pc2 -hc prog" fail -h -c -n 100 $helper /bin/true
281
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:ALL -- image=/bin/true /bin/true:rix ptrace:trace:notaprofile
282
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:ALL -- image=/bin/true /bin/true:rix ptrace:trace:peer=notaprofile
283
runchecktest "test 13pd2 -h prog" fail -h -n 100 $helper /bin/true
284
runchecktest "test 13pe2 -hc prog" fail -h -c -n 100 $helper /bin/true
286
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:tracedby -- image=/bin/true /bin/true:rix
287
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:tracedby -- image=/bin/true /bin/true:rix
288
runchecktest "test 13p13 -h prog" fail -h -n 100 $helper /bin/true
289
runchecktest "test 13p23 -hc prog" fail -h -c -n 100 $helper /bin/true
290
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:tracedby -- image=/bin/true /bin/true:rix ptrace:tracedby
291
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:tracedby -- image=/bin/true /bin/true:rix ptrace:tracedby
292
runchecktest "test 13p33 -h prog" fail -h -n 100 $helper /bin/true
293
runchecktest "test 13p43 -hc prog" fail -h -c -n 100 $helper /bin/true
294
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:tracedby -- image=/bin/true /bin/true:rix ptrace:tracedby:$test
295
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:tracedby -- image=/bin/true /bin/true:rix ptrace:tracedby:peer=$test
296
runchecktest "test 13p53 -h prog" fail -h -n 100 $helper /bin/true
297
runchecktest "test 13p63 -hc prog" fail -h -c -n 100 $helper /bin/true
298
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:tracedby -- image=/bin/true /bin/true:rix ptrace:tracedby:notaprofile
299
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:tracedby -- image=/bin/true /bin/true:rix ptrace:tracedby:peer=notaprofile
300
runchecktest "test 13p73 -h prog" fail -h -n 100 $helper /bin/true
301
runchecktest "test 13p83 -hc prog" fail -h -c -n 100 $helper /bin/true
302
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:tracedby -- image=/bin/true /bin/true:rix ptrace:trace
303
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:tracedby -- image=/bin/true /bin/true:rix ptrace:trace
304
runchecktest "test 13p93 -h prog" fail -h -n 100 $helper /bin/true
305
runchecktest "test 13pa3 -hc prog" fail -h -c -n 100 $helper /bin/true
306
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:tracedby -- image=/bin/true /bin/true:rix ptrace:trace:$test
307
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:tracedby -- image=/bin/true /bin/true:rix ptrace:trace:peer=$test
308
runchecktest "test 13pb3 -h prog" fail -h -n 100 $helper /bin/true
309
runchecktest "test 13pc3 -hc prog" fail -h -c -n 100 $helper /bin/true
310
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:tracedby -- image=/bin/true /bin/true:rix ptrace:trace:notaprofile
311
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:tracedby -- image=/bin/true /bin/true:rix ptrace:trace:peer=notaprofile
312
runchecktest "test 13pd3 -h prog" fail -h -n 100 $helper /bin/true
313
runchecktest "test 13pe3 -hc prog" fail -h -c -n 100 $helper /bin/true
315
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:tracedby:notaprofile -- image=/bin/true /bin/true:rix
316
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:tracedby:peer=notaprofile -- image=/bin/true /bin/true:rix
317
runchecktest "test 13p14 -h prog" fail -h -n 100 $helper /bin/true
318
runchecktest "test 13p24 -hc prog" fail -h -c -n 100 $helper /bin/true
319
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:tracedby:notaprofile -- image=/bin/true /bin/true:rix ptrace:tracedby
320
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:tracedby:peer=notaprofile -- image=/bin/true /bin/true:rix ptrace:tracedby
321
runchecktest "test 13p34 -h prog" fail -h -n 100 $helper /bin/true
322
runchecktest "test 13p44 -hc prog" fail -h -c -n 100 $helper /bin/true
323
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:tracedby:notaprofile -- image=/bin/true /bin/true:rix ptrace:tracedby:$test
324
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:tracedby:peer=notaprofile -- image=/bin/true /bin/true:rix ptrace:tracedby:peer=$test
325
runchecktest "test 13p54 -h prog" fail -h -n 100 $helper /bin/true
326
runchecktest "test 13p64 -hc prog" fail -h -c -n 100 $helper /bin/true
327
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:tracedby:notaprofile -- image=/bin/true /bin/true:rix ptrace:tracedby:notaprofile
328
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:tracedby:peer=notaprofile -- image=/bin/true /bin/true:rix ptrace:tracedby:peer=notaprofile
329
runchecktest "test 13p74 -h prog" fail -h -n 100 $helper /bin/true
330
runchecktest "test 13p84 -hc prog" fail -h -c -n 100 $helper /bin/true
331
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:tracedby:notaprofile -- image=/bin/true /bin/true:rix ptrace:trace
332
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:tracedby:peer=notaprofile -- image=/bin/true /bin/true:rix ptrace:trace
333
runchecktest "test 13p94 -h prog" fail -h -n 100 $helper /bin/true
334
runchecktest "test 13pa4 -hc prog" fail -h -c -n 100 $helper /bin/true
335
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:tracedby:notaprofile -- image=/bin/true /bin/true:rix ptrace:trace:$test
336
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:tracedby:peer=notaprofile -- image=/bin/true /bin/true:rix ptrace:trace:peer=$test
337
runchecktest "test 13pb4 -h prog" fail -h -n 100 $helper /bin/true
338
runchecktest "test 13pc4 -hc prog" fail -h -c -n 100 $helper /bin/true
339
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:tracedby:notaprofile -- image=/bin/true /bin/true:rix ptrace:trace:notaprofile
340
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:tracedby:peer=notaprofile -- image=/bin/true /bin/true:rix ptrace:trace:peer=notaprofile
341
runchecktest "test 13pd4 -h prog" fail -h -n 100 $helper /bin/true
342
runchecktest "test 13pe4 -hc prog" fail -h -c -n 100 $helper /bin/true
344
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:notaprofile -- image=/bin/true /bin/true:rix
345
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:peer=notaprofile -- image=/bin/true /bin/true:rix
346
runchecktest "test 13p15 -h prog" fail -h -n 100 $helper /bin/true
347
runchecktest "test 13p25 -hc prog" fail -h -c -n 100 $helper /bin/true
348
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:notaprofile -- image=/bin/true /bin/true:rix ptrace:tracedby
349
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:peer=notaprofile -- image=/bin/true /bin/true:rix ptrace:tracedby
350
runchecktest "test 13p35 -h prog" fail -h -n 100 $helper /bin/true
351
runchecktest "test 13p45 -hc prog" fail -h -c -n 100 $helper /bin/true
352
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:notaprofile -- image=/bin/true /bin/true:rix ptrace:tracedby:$test
353
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:peer=notaprofile -- image=/bin/true /bin/true:rix ptrace:tracedby:peer=$test
354
runchecktest "test 13p55 -h prog" fail -h -n 100 $helper /bin/true
355
runchecktest "test 13p65 -hc prog" fail -h -c -n 100 $helper /bin/true
356
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:notaprofile -- image=/bin/true /bin/true:rix ptrace:tracedby:notaprofile
357
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:peer=notaprofile -- image=/bin/true /bin/true:rix ptrace:tracedby:peer=notaprofile
358
runchecktest "test 13p75 -h prog" fail -h -n 100 $helper /bin/true
359
runchecktest "test 13p85 -hc prog" fail -h -c -n 100 $helper /bin/true
360
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:notaprofile -- image=/bin/true /bin/true:rix ptrace:trace
361
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:peer=notaprofile -- image=/bin/true /bin/true:rix ptrace:trace
362
runchecktest "test 13p95 -h prog" fail -h -n 100 $helper /bin/true
363
runchecktest "test 13pa5 -hc prog" fail -h -c -n 100 $helper /bin/true
364
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:notaprofile -- image=/bin/true /bin/true:rix ptrace:trace:$test
365
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:peer=notaprofile -- image=/bin/true /bin/true:rix ptrace:trace:peer=$test
366
runchecktest "test 13pb5 -h prog" fail -h -n 100 $helper /bin/true
367
runchecktest "test 13pc5 -hc prog" fail -h -c -n 100 $helper /bin/true
368
-genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:$test ptrace:notaprofile -- image=/bin/true /bin/true:rix ptrace:trace:notaprofile
369
+genprofile /bin/true:rpx $helper:rix signal:ALL ptrace:peer=$test ptrace:peer=notaprofile -- image=/bin/true /bin/true:rix ptrace:trace:peer=notaprofile
370
runchecktest "test 13pd5 -h prog" fail -h -n 100 $helper /bin/true
371
runchecktest "test 13pe5 -hc prog" fail -h -c -n 100 $helper /bin/true
373
Index: ipc-fixes-and-improvements/tests/regression/apparmor/pwrite.sh
374
===================================================================
375
--- ipc-fixes-and-improvements.orig/tests/regression/apparmor/pwrite.sh 2014-03-30 09:48:03.720238309 -0500
376
+++ ipc-fixes-and-improvements/tests/regression/apparmor/pwrite.sh 2014-03-30 09:48:03.712238309 -0500
377
@@ -23,7 +23,7 @@ badreadperm=w
381
-genprofile $file:$okperm
382
+genprofile $file:$okperm signal:receive:peer=unconfined
384
runtestbg "PREAD/PWRITE with rw" pass $file
386
Index: ipc-fixes-and-improvements/tests/regression/apparmor/rw.sh
387
===================================================================
388
--- ipc-fixes-and-improvements.orig/tests/regression/apparmor/rw.sh 2014-03-30 09:48:03.720238309 -0500
389
+++ ipc-fixes-and-improvements/tests/regression/apparmor/rw.sh 2014-03-30 09:48:03.712238309 -0500
390
@@ -29,7 +29,7 @@ badperm=r
394
-genprofile $file:$okperm
395
+genprofile $file:$okperm signal:receive:peer=unconfined
397
runtestbg "READ/WRITE pass" pass $file