Changes in Makefile

a23e1966932464e1c5226cb9ac4ce1d5fc10ba22 - Merge branch 'next' into for-linus

Mon, 15 Jul 2024 23:03:44 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.11 merge window. List of files: /linux/security/integrity/ima/Makefile

6f47c7ae8c7afaf9ad291d39f0d3974f191a7946 - Merge tag 'v6.9' into next

Tue, 28 May 2024 06:37:18 +0200

Merge tag 'v6.9' into nextSync up with the mainline to bring in the new cleanup API. List of files: /linux/security/integrity/ima/Makefile

60a2f25de7b8b785baee2932db932ae9a5b8c86d - Merge drm/drm-next into drm-intel-gt-next

Thu, 16 May 2024 09:33:01 +0200

Merge drm/drm-next into drm-intel-gt-nextSome display refactoring patches are needed in order to allow conflict-less merging.Signed-off-by: Tvrtko Ursulin List of files: /linux/security/integrity/ima/Makefile

594ce0b8a998aa4d05827cd7c0d0dcec9a1e3ae2 - Merge topic branches 'clkdev' and 'fixes' into for-linus

Mon, 10 Jun 2024 13:03:21 +0200

Merge topic branches 'clkdev' and 'fixes' into for-linus List of files: /linux/security/integrity/ima/Makefile

b228ab57e51b62663a80ca820c87ba2650583f08 - Merge branch 'master' into mm-stable

Mon, 18 Mar 2024 17:55:12 +0100

Merge branch 'master' into mm-stable List of files: /linux/security/integrity/ima/Makefile

79790b6818e96c58fe2bffee1b418c16e64e7b80 - Merge drm/drm-next into drm-xe-next

Fri, 12 Apr 2024 15:14:25 +0200

Merge drm/drm-next into drm-xe-nextBackmerging drm-next in order to get up-to-date and in particularto access commit 9ca5facd0400f610f3f7f71aeb7fc0b949a48c67.Signed-off-by: Thomas Hellström List of files: /linux/security/integrity/ima/Makefile

3e5a516f3bf1a33f2bf219f570e9b5c031616f6a - Merge tag 'phy_dp_modes_6.10' into msm-next-lumag

Mon, 08 Apr 2024 17:35:51 +0200

Merge tag 'phy_dp_modes_6.10' into msm-next-lumagMerge DisplayPort subnode API in order to allow DisplayPort driver toconfigure the PHYs either to the DP or eDP mode, depending on hardwareconfiguration.Signed-off-by: Dmitry Baryshkov List of files: /linux/security/integrity/ima/Makefile

5add703f6acad1c63f8a532b6de56e50d548e904 - Merge drm/drm-next into drm-intel-next

Tue, 02 Apr 2024 14:17:13 +0200

Merge drm/drm-next into drm-intel-nextCatching up on 6.9-rc2Signed-off-by: Rodrigo Vivi List of files: /linux/security/integrity/ima/Makefile

0d21364c6e8dc1f62c34bbc49d49935c8b01844c - Merge drm/drm-next into drm-misc-next

Tue, 02 Apr 2024 09:51:30 +0200

Merge drm/drm-next into drm-misc-nextBackmerging to get v6.9-rc2 changes into drm-misc-next.Signed-off-by: Thomas Zimmermann List of files: /linux/security/integrity/ima/Makefile

b7e1e969c887c897947fdc3754fe9b0c24acb155 - Merge branch 'topic/sound-devel-6.10' into for-next

Tue, 26 Mar 2024 12:19:11 +0100

Merge branch 'topic/sound-devel-6.10' into for-next List of files: /linux/security/integrity/ima/Makefile

537c2e91d3549e5d6020bb0576cf9b54a845255f - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Fri, 22 Mar 2024 00:14:13 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netCross-merge networking fixes after downstream PR.Signed-off-by: Jakub Kicinski List of files: /linux/security/integrity/ima/Makefile

f4566a1e73957800df75a3dd2dccee8a4697f327 - Merge tag 'v6.9-rc1' into sched/core, to pick up fixes and to refresh the branch

Mon, 25 Mar 2024 11:32:29 +0100

Merge tag 'v6.9-rc1' into sched/core, to pick up fixes and to refresh the branchSigned-off-by: Ingo Molnar List of files: /linux/security/integrity/ima/Makefile

100c85421b52e41269ada88f7d71a6b8a06c7a11 - Merge tag 'asoc-fix-v6.9-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Fri, 05 Apr 2024 08:48:12 +0200

Merge tag 'asoc-fix-v6.9-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v6.9A relatively large set of fixes here, the biggest piece of it is aseries correcting some problems with the delay reporting for Intel SOFcards but there's a bunch of other things. Everything here is driverspecific except for a fix in the core for an issue with sign extensionhandling volume controls. List of files: /linux/security/integrity/ima/Makefile

36a1818f5a1e50b805317ba13f827067d50f6970 - Merge drm/drm-fixes into drm-misc-fixes

Mon, 25 Mar 2024 21:11:58 +0100

Merge drm/drm-fixes into drm-misc-fixesBackmerging to get drm-misc-fixes to the state of v6.9-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/security/integrity/ima/Makefile

cc4a875cf3b3bc07d523ea85b8ca45da1ca4f4e6 - Merge tag 'lsm-pr-20240312' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm

Wed, 13 Mar 2024 04:03:34 +0100

Merge tag 'lsm-pr-20240312' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsmPull lsm updates from Paul Moore: - Promote IMA/EVM to a proper LSM This is the bulk of the diffstat, and the source of all the changes in the VFS code. Prior to the start of the LSM stacking work it was important that IMA/EVM were separate from the rest of the LSMs, complete with their own hooks, infrastructure, etc. as it was the only way to enable IMA/EVM at the same time as a LSM. However, now that the bulk of the LSM infrastructure supports multiple simultaneous LSMs, we can simplify things greatly by bringing IMA/EVM into the LSM infrastructure as proper LSMs. This is something I've wanted to see happen for quite some time and Roberto was kind enough to put in the work to make it happen. - Use the LSM hook default values to simplify the call_int_hook() macro Previously the call_int_hook() macro required callers to supply a default return value, despite a default value being specified when the LSM hook was defined. This simplifies the macro by using the defined default return value which makes life easier for callers and should also reduce the number of return value bugs in the future (we've had a few pop up recently, hence this work). - Use the KMEM_CACHE() macro instead of kmem_cache_create() The guidance appears to be to use the KMEM_CACHE() macro when possible and there is no reason why we can't use the macro, so let's use it. - Fix a number of comment typos in the LSM hook comment blocks Not much to say here, we fixed some questionable grammar decisions in the LSM hook comment blocks.* tag 'lsm-pr-20240312' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm: (28 commits) cred: Use KMEM_CACHE() instead of kmem_cache_create() lsm: use default hook return value in call_int_hook() lsm: fix typos in security/security.c comment headers integrity: Remove LSM ima: Make it independent from 'integrity' LSM evm: Make it independent from 'integrity' LSM evm: Move to LSM infrastructure ima: Move IMA-Appraisal to LSM infrastructure ima: Move to LSM infrastructure integrity: Move integrity_kernel_module_request() to IMA security: Introduce key_post_create_or_update hook security: Introduce inode_post_remove_acl hook security: Introduce inode_post_set_acl hook security: Introduce inode_post_create_tmpfile hook security: Introduce path_post_mknod hook security: Introduce file_release hook security: Introduce file_post_open hook security: Introduce inode_post_removexattr hook security: Introduce inode_post_setattr hook security: Align inode_setattr hook definition with EVM ... List of files: /linux/security/integrity/ima/Makefile

4de2f084fbff41113d9adec3c9e15ab12bf05e21 - ima: Make it independent from 'integrity' LSM

Thu, 15 Feb 2024 11:31:12 +0100

ima: Make it independent from 'integrity' LSMMake the 'ima' LSM independent from the 'integrity' LSM by introducing IMAown integrity metadata (ima_iint_cache structure, with IMA-specific fieldsfrom the integrity_iint_cache structure), and by managing it directly fromthe 'ima' LSM.Create ima_iint.c and introduce the same integrity metadata managementfunctions found in iint.c (renamed with ima_). However, instead of puttingmetadata in an rbtree, reserve space from IMA in the inode security blobfor a pointer, and introduce the ima_inode_set_iint()/ima_inode_get_iint()primitives to store/retrieve that pointer. This improves search time fromlogarithmic to constant.Consequently, don't include the inode pointer as field in theima_iint_cache structure, since the association with the inode is clear.Since the inode field is missing in ima_iint_cache, pass the extra inodeparameter to ima_get_verity_digest().Prefer storing the pointer instead of the entire ima_iint_cache structure,to avoid too much memory pressure. Use the same mechanism as before, acache named ima_iint_cache (renamed from iint_cache), to quickly allocatea new ima_iint_cache structure when requested by the IMA policy.Create the new ima_iint_cache in ima_iintcache_init(),called by init_ima_lsm(), during the initialization of the 'ima' LSM. And,register ima_inode_free_security() to free the ima_iint_cache structure, ifexists.Replace integrity_iint_cache with ima_iint_cache in various places of theIMA code. Also, replace integrity_inode_get() and integrity_iint_find(),respectively with ima_inode_get() and ima_iint_find().Finally, move the remaining IMA-specific flagsto security/integrity/ima/ima.h, since they are now unnecessary in thecommon integrity layer.Signed-off-by: Roberto Sassu Reviewed-by: Casey Schaufler Reviewed-by: Stefan Berger Reviewed-by: Mimi Zohar Acked-by: Mimi Zohar Signed-off-by: Paul Moore List of files: /linux/security/integrity/ima/Makefile

cdd38c5f1ce4398ec58fec95904b75824daab7b5 - Merge remote-tracking branch 'net/master'

Wed, 24 Feb 2021 13:36:58 +0100

Merge remote-tracking branch 'net/master' List of files: /linux/security/integrity/ima/Makefile

803074ad77b91e270c1ce90793a924cdb4547162 - Merge branches 'rgrp-glock-sharing' and 'gfs2-revoke' from https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git

Mon, 22 Feb 2021 21:22:16 +0100

Merge branches 'rgrp-glock-sharing' and 'gfs2-revoke' from https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.gitMerge the resource group glock sharing feature and the revoke accounting rework.Signed-off-by: Andreas Gruenbacher List of files: /linux/security/integrity/ima/Makefile

d6310078d9f8c416e85f641a631aecf58f9c97ff - Merge branch 'for-5.12/google' into for-linus

Tue, 23 Feb 2021 11:33:13 +0100

Merge branch 'for-5.12/google' into for-linus- User experience improvements for hid-google from Nicolas Boichat List of files: /linux/security/integrity/ima/Makefile

cbecf716ca618fd44feda6bd9a64a8179d031fc5 - Merge branch 'next' into for-linus

Tue, 23 Feb 2021 06:35:15 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.12 merge window. List of files: /linux/security/integrity/ima/Makefile