Commits · e9f1ddc8941b921cadc7fb4d5bb2742a5cb0c958 · Kirill Smelkov / linux

06 Apr, 2016 40 commits

Revert "UBUNTU: SAUCE: (no-up) apparmor: fix mount not handling disconnected paths" · e9f1ddc8

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 1e7328d5.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

e9f1ddc8

Revert "UBUNTU: SAUCE: (no-up) apparmor: Fix incompatible pointer type warnings" · f5f4b517

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 5a22abd4.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

f5f4b517

Revert "UBUNTU: SAUCE: (no-up): apparmor: fix for failed mediation of socket... · 66e90b6a

John Johansen authored Mar 18, 2016

Revert "UBUNTU: SAUCE: (no-up): apparmor: fix for failed mediation of socket that is being shutdown"

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit e35fe568.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

66e90b6a

Revert "UBUNTU: SAUCE: apparmor: fix sleep from invalid context" · dbcabfda

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit f970350049bdb24c3b3bdf4ef8c162833c4f2dd8.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

dbcabfda

Revert "UBUNTU: SAUCE: fix-up: kern_mount fail path should not be doing put_buffers()" · b78947f7

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit bcc4061cfc6cc47f311b0666eef5f69ee5bf392d.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

b78947f7

Revert "UBUNTU: SAUCE: apparmor: Fix: oops do to invalid null ptr deref in label print fns" · d0f3986b

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 949769a80df6a9446e63d56a1d7aa7da11cb4d9c.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

d0f3986b

Revert "UBUNTU: SAUCE: apparmor: Disallow update of cred when then subjective... · 4bf2dc6b

John Johansen authored Mar 18, 2016

Revert "UBUNTU: SAUCE: apparmor: Disallow update of cred when then subjective != the objective cred"

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 1f95c6b69724417ab7039e924ec1a46cdc2f3a03.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

4bf2dc6b

Revert "UBUNTU: SAUCE: apparmor: rework retrieval of the current label in the profile update case" · 85978f5f

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 8a6a317400fcd5e4eebfc20665ca0b3e8dbc8217.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

85978f5f

Revert "UBUNTU: SAUCE: apparmor: Fix: insert race between label_update and label_merge" · a4fb04fb

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit c8cf841fc8307461847036d2be2ad27791be485b.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

a4fb04fb

Revert "UBUNTU: SAUCE: apparmor: Fix: ensure aa_get_newest will trip debugging... · e558d44c

John Johansen authored Mar 18, 2016

Revert "UBUNTU: SAUCE: apparmor: Fix: ensure aa_get_newest will trip debugging if the replacedby is not setup"

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 9b02a4b233d1b5b9ec3cb4353b894089a1bf9ea0.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

e558d44c

Revert "UBUNTU: SAUCE: apparmor: debug: POISON label and replaceby pointer on free" · 1963692b

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit a74bd8e71cad1328bf5b933aeb7ac75d9f350c87.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

1963692b

Revert "UBUNTU: SAUCE: apparmor: add underscores to indicate... · d39820a1

John Johansen authored Mar 18, 2016

Revert "UBUNTU: SAUCE: apparmor: add underscores to indicate aa_label_next_not_in_set() use needs locking"

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit ee2d7f94c7e6c72e8cbaafc37e78d50a7bbd2323.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

d39820a1

Revert "UBUNTU: SAUCE: apparmor: Fix: label merge handling of marking unconfined and stale" · 709bba29

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 919e68433341077eec6b72c268447e2883f5c0b8.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

709bba29

Revert "UBUNTU: SAUCE: apparmor: Fix: refcount race between locating in labelset and get" · e23c92ae

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 3ceb6a970f5eec7580ec740ed493b07c142984f2.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

e23c92ae

Revert "UBUNTU: SAUCE: apparmor: Fix: refcount leak in aa_label_merge" · 03c5aa50

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit a62647332d731a4d498d7a99d52926d5b0df739a.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

03c5aa50

Revert "UBUNTU: SAUCE: apparmor: Fix: ensure new labels resulting from merge have a replacedby" · 93e7aa83

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 2928259cc7e695219d348927e7557e4a83fc92c8.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

93e7aa83

Revert "UBUNTU: SAUCE: apparmor: Fix: label_vec_merge insertion" · 8812fb2d

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 4cce60ba994d9c9e58d731c14cb257ca2c4ddeb6.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

8812fb2d

Revert "UBUNTU: SAUCE: apparmor: Fix: deadlock in aa_put_label() call chain" · e6ce3c3c

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 981d09c847dd7a382c069e81b4dd9ae0b180d698.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

e6ce3c3c

Revert "UBUNTU: SAUCE: apparmor: Fix: add required locking of __aa_update_replacedby on merge path" · a2a815e5

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit c6a6d05f05cea01eece5d29f0bb9537c401315d1.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

a2a815e5

Revert "UBUNTU: SAUCE: apparmor: Fix: convert replacedby update to be... · 4d69b183

John Johansen authored Mar 18, 2016

Revert "UBUNTU: SAUCE: apparmor: Fix: convert replacedby update to be protected by the labelset lock"

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 6b05f95e2bd24c98400eae1c25d36a10242e7f5b.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

4d69b183

Revert "UBUNTU: SAUCE: apparmor: Fix: update replacedby allocation to take a gfp parameter" · 8ac21d39

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 7e0977f6bb9ce90dcd316a3bf4c43546aac9f444.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

8ac21d39

Revert "UBUNTU: SAUCE: apparmor: ensure that repacedby sharing is done correctly" · 0b249838

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit b91470b3c68da4e10aeacfa4dac142327123093f.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

0b249838

Revert "UBUNTU: SAUCE: apparmor Fix: refcount bug in pivotroot mediation" · d0d9813b

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 2c30f8bde8c7986abcd2d18b4fa21565eede7dca.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

d0d9813b

Revert "UBUNTU: SAUCE: apparmor: Fix: now that insert can force replacement... · 19335fb6

John Johansen authored Mar 18, 2016

Revert "UBUNTU: SAUCE: apparmor: Fix: now that insert can force replacement use it instead of remove_and_insert"

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 7c2edd90b522bb373a6be6971ba8a3cfbc99ed1d.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

19335fb6

Revert "UBUNTU: SAUCE: apparmor: Fix: refcount bug when inserting label update that transitions ns" · 2c5f23c4

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit cfc72134ff8c7fba8f3e0711f900826e817eed5c.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

2c5f23c4

Revert "UBUNTU: SAUCE: apparmor: Fix: break circular refcount for label that is directly freed." · b322f3d5

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 5f63d8b8931e1e33c62793583e9e5ed66ca9cc4b.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

b322f3d5

Revert "UBUNTU: SAUCE: apparmor: Don't remove label on rcu callback if the... · 91b65ec6

John Johansen authored Mar 18, 2016

Revert "UBUNTU: SAUCE: apparmor: Don't remove label on rcu callback if the label has already been removed"

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 838dc2541c639b30a25ecb484cb63c04e2848d8d.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

91b65ec6

Revert "UBUNTU: SAUCE: apparmor: Fix: query label file permission" · d918ada2

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 07e05b2781aa973f95f31d7cb7789a986ddc9583.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

d918ada2

Revert "UBUNTU: SAUCE: apparmor: fix: ref count leak when profile sha1 hash is read" · 0640a0d9

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit b3df5394a0650d4135f465e3b94c0d6325f3e830.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

0640a0d9

Revert "UBUNTU: SAUCE: fixup: cleanup return handling of labels" · 7e972668

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 90517b72df39a6cdf78d8bc50045c533d3844f73.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

7e972668

Revert "UBUNTU: SAUCE: apparmor: fix log of apparmor audit message when kern_path() fails" · 130e293d

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit ee0d667727eadf194825ecbb7524faa4c425ab8a.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

130e293d

Revert "UBUNTU: SAUCE: fix: replacedby forwarding is not being properly update... · 67194e9d

John Johansen authored Mar 18, 2016

Revert "UBUNTU: SAUCE: fix: replacedby forwarding is not being properly update when ns is destroyed"

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 3945d2ba547424551dac4801150b33016519f648.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

67194e9d

Revert "UBUNTU: SAUCE: fixup: make __share_replacedby private to get rid of build warning" · 98be286f

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 844c52f03735e9d39e76e515e509a103677a71fa.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

98be286f

Revert "UBUNTU: SAUCE: fixup: 20/23 locking issue around in __label_update" · 8caa4d52

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit bd0bf02f160e39b34a63a8ab35ab34fff74efb40.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

8caa4d52

Revert "UBUNTU: SAUCE: fixup: get rid of unused var build warning" · 17aa743a

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 5e08368fa2f94a46ae9d06c37d3519b92abe158e.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

17aa743a

Revert "UBUNTU: SAUCE: fixup: cast poison values to remove warnings" · 8e575eed

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 86d51202b3e9fd9e1b44766f231f38f8e88e4c9c.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

8e575eed

Revert "UBUNTU: SAUCE: apparmor: fix refcount race when finding a child profile" · db7722c5

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 4dd6c2373c433dad655c265616465bb06ca615d9.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

db7722c5

Revert "UBUNTU: SAUCE: fixup: warning about aa_label_vec_find_or_create not being static" · 1c7d0095

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 2d9e947542095ff2e927152f013bf82d44948792.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

1c7d0095

Revert "UBUNTU: SAUCE: fix: audit "no_new_privs" case for exec failure" · c4cfbcd8

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit b9eab948e47cad7504c32f5e6e6b65c97ff27345.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

c4cfbcd8

Revert "UBUNTU: SAUCE: Fixup: __label_update() still doesn't handle some cases correctly." · a4d2e2f9

John Johansen authored Mar 18, 2016

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 5d4140b82656bb1910d10a7e3af885d1c9e21a4d.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

a4d2e2f9