~ubuntu-branches/ubuntu/wily/apparmor/wily

« back to all changes in this revision

Viewing changes to kernel-patches/for-mainline/link-subset-check-2.diff

• browse files at revision 6
• compare with another revision
• download diff
• download tarball
• view history from revision 6

Show diffs side-by-side

added

removed

kernel-patches/for-mainline/link-subset-check-2.diff

1

 

Index: b/security/apparmor/main.c

2

 

===================================================================

3

 

--- a/security/apparmor/main.c

4

 

+++ b/security/apparmor/main.c

5

 

@@ -120,11 +120,12 @@ static int aa_link_denied(struct aa_prof

6

 

         * Allow to link

7

 

         * - if we have permission to rename, or

8

 

         * - if we are only allowed to link and to read the target,

9

 

-        *   but not to write to the link.

10

 

+        *   but not to write to the link, and also only if the link

11

 

+        *   won't add any form of execute access.

12

 

         */

13

 

        if (((l_mode & MAY_WRITE) &&

14

 

             (t_mode & (MAY_READ | MAY_WRITE) == (MAY_READ | MAY_WRITE))) ||

15

 

-           ((l_mode & (MAY_WRITE | AA_MAY_LINK) == AA_MAY_LINK) &&

16

 

+           ((l_mode & (MAY_WRITE | MAY_EXEC | AA_MAY_LINK) == AA_MAY_LINK) &&

17

 

             (t_mode & MAY_READ)))

18

 

                return 0;

19

 

 

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1