Merge lp:~talkless/apparmor/seven_digit_pid into lp:apparmor/2.12

Proposed by Vincas Dargis on 2017-09-30
Status: Merged
Merged at revision: 3722
Proposed branch: lp:~talkless/apparmor/seven_digit_pid
Merge into: lp:apparmor/2.12
Diff against target: 12 lines (+1/-1)
1 file modified
profiles/apparmor.d/tunables/kernelvars (+1/-1)
To merge this branch: bzr merge lp:~talkless/apparmor/seven_digit_pid
Reviewer Review Type Date Requested Status
Steve Beattie 2017-09-30 Approve on 2017-10-26
intrigeri Approve on 2017-10-23
Review via email: mp+331614@code.launchpad.net

Description of the change

Allow pids up to PID_MAX_LIMIT which is 2^22 (a seven digit 4194304)

Fixes https://bugs.launchpad.net/apparmor/+bug/1717714

To post a comment you must log in.
intrigeri (intrigeri) wrote :

Looks good to me, thanks Vincas!

review: Approve
Steve Beattie (sbeattie) wrote :

Looks good to me, too, merged to trunk and 2.11 branch.

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'profiles/apparmor.d/tunables/kernelvars'
2--- profiles/apparmor.d/tunables/kernelvars 2013-01-02 23:02:29 +0000
3+++ profiles/apparmor.d/tunables/kernelvars 2017-09-30 12:31:56 +0000
4@@ -13,7 +13,7 @@
5 # and until the parser supports nested groupings like
6 # @{pid}=[1-9]{[0-9]{[0-9]{[0-9]{[0-9]{[0-9],},},},},}
7 # use
8-@{pid}={[1-9],[1-9][0-9],[1-9][0-9][0-9],[1-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9][0-9]}
9+@{pid}={[1-9],[1-9][0-9],[1-9][0-9][0-9],[1-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9][0-9],[1-4][0-9][0-9][0-9][0-9][0-9][0-9]}
10
11 #same pattern as @{pid} for now
12 @{tid}=@{pid}

Subscribers

People subscribed via source and target branches