summaryrefslogtreecommitdiff
path: root/security
AgeCommit message (Expand)Author
2017-08-08Merge "Merge android-4.4@59ff2e1 (v4.4.78) into msm-4.4"Linux Build Service Account
2017-08-04Merge android-4.4@59ff2e1 (v4.4.78) into msm-4.4Blagovest Kolenichev
2017-07-19Merge "security: pfe: Synchronize the file key usage"Linux Build Service Account
2017-07-18security: pfe: Synchronize the file key usageNeeraj Soni
2017-07-15Merge 4.4.77 into android-4.4Greg Kroah-Hartman
2017-07-15KEYS: Fix an error code in request_master_key()Dan Carpenter
2017-07-10Merge android-4.4@64a73ff (v4.4.76) into msm-4.4Blagovest Kolenichev
2017-06-30UPSTREAM: selinux: enable genfscon labeling for tracefsJeff Vander Stoep
2017-06-20Merge branch 'android-4.4@e76c0fa' into branch 'msm-4.4'Blagovest Kolenichev
2017-06-14Merge 4.4.72 into android-4.4Greg Kroah-Hartman
2017-06-14KEYS: fix freeing uninitialized memory in key_update()Eric Biggers
2017-06-14KEYS: fix dereferencing NULL payload with nonzero lengthEric Biggers
2017-06-07Merge branch 'android-4.4@9bc4622' into branch 'msm-4.4'Blagovest Kolenichev
2017-05-25Merge 4.4.70 into android-4.4Greg Kroah-Hartman
2017-05-25ima: accept previously set IMA_NEW_FILEDaniel Glöckner
2017-05-02Merge branch 'android-4.4@e4528dd' into branch 'msm-4.4'Blagovest Kolenichev
2017-04-27Merge 4.4.64 into android-4.4Greg Kroah-Hartman
2017-04-27KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyringsEric Biggers
2017-04-27KEYS: Change the name of the dead type to ".dead" to prevent user accessDavid Howells
2017-04-27KEYS: Disallow keyrings beginning with '.' to be joined as session keyringsDavid Howells
2017-04-04security: pfe: Remove __exit annotation to fix section mismatchStephen Boyd
2017-03-21Merge "security: pfe: Adapt ICE engine setup call for eMMC"Linux Build Service Account
2017-03-20security: pfe: Adapt ICE engine setup call for eMMCNeeraj Soni
2017-03-18Merge tag 'lsk-v4.4-17.02-android' into branch 'msm-4.4'Runmin Wang
2017-02-28Merge tag 'lsk-v4.4-16.12-android' into branch 'msm-4.4'Runmin Wang
2017-02-15Merge remote-tracking branch 'common/android-4.4' into android-4.4.yDmitry Shmidt
2017-02-15Merge tag 'v4.4.49' into android-4.4.yDmitry Shmidt
2017-02-15Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidAlex Shi
2017-02-15 Merge tag 'v4.4.49' into linux-linaro-lsk-v4.4Alex Shi
2017-02-14selinux: fix off-by-one in setprocattrStephen Smalley
2017-02-10ANDROID: export security_path_chownDaniel Rosenberg
2017-02-08ice: fix issue with losing ICE key configuration during resetAndrey Markovytch
2017-02-06ANDROID: security: export security_path_chown()Amit Pundir
2017-02-03ANDROID: vfs: Add permission2 for filesystems with per mount permissionsDaniel Rosenberg
2017-01-26ANDROID: vfs: Add permission2 for filesystems with per mount permissionsDaniel Rosenberg
2017-01-22Merge "ufs: fixed bugs in ice related to key syncronization"Linux Build Service Account
2017-01-19ufs: fixed bugs in ice related to key syncronizationAndrey Markovytch
2017-01-16Merge "KEYS: Fix short sprintf buffer in /proc/keys show function"Linux Build Service Account
2017-01-10KEYS: Fix short sprintf buffer in /proc/keys show functionDavid Howells
2017-01-09security: switched to stackable model for PFT/PFK moduleAndrey Markovytch
2016-12-16Merge branch 'v4.4-16.09-android-tmp' into lsk-v4.4-16.09-androidRunmin Wang
2016-12-06Merge tag 'v4.4.36' into android-4.4.yDmitry Shmidt
2016-12-06Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidAlex Shi
2016-12-05 Merge tag 'v4.4.36' into linux-linaro-lsk-v4.4Alex Shi
2016-12-02apparmor: fix change_hat not finding hat after policy replacementJohn Johansen
2016-11-15Merge tag 'v4.4.32' into android-4.4.yDmitry Shmidt
2016-11-15Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidAmit Pundir
2016-11-11 Merge tag 'v4.4.31' into linux-linaro-lsk-v4.4Alex Shi
2016-11-10KEYS: Fix short sprintf buffer in /proc/keys show functionDavid Howells
2016-11-04Merge "Merge remote-tracking branch 'msm4.4/tmp-da9a92f' into msm-4.4"Linux Build Service Account