Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
linux
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Debian kernel team
linux
Commits
f3c3de0f
Commit
f3c3de0f
authored
8 years ago
by
Ben Hutchings
Browse files
Options
Downloads
Patches
Plain Diff
integrity: Enable IMA and related kconfig symbols (except on armel/marvell)
Closes: #788290 Based on advice from Matthew Garrett.
parent
6771be11
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
debian/changelog
+3
-0
3 additions, 0 deletions
debian/changelog
debian/config/armel/config.marvell
+5
-0
5 additions, 0 deletions
debian/config/armel/config.marvell
debian/config/config
+15
-1
15 additions, 1 deletion
debian/config/config
with
23 additions
and
1 deletion
debian/changelog
+
3
−
0
View file @
f3c3de0f
...
...
@@ -343,6 +343,9 @@ linux (4.9.24-1) UNRELEASED; urgency=medium
* [x86] gpio: Enable GPIO_AMDPT as module
* [x86] thermal: Enable INT3406_THERMAL as module
* watchdog: Enable WATCHDOG_SYSFS
* integrity: Enable IMA, IMA_DEFAULT_HASH_SHA256, IMA_APPRAISE,
IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY, IMA_BLACKLIST_KEYRING
(except on armel/marvell) (Closes: #788290)
[ Salvatore Bonaccorso ]
* ping: implement proper locking (CVE-2017-2671)
This diff is collapsed.
Click to expand it.
debian/config/armel/config.marvell
+
5
−
0
View file @
f3c3de0f
...
...
@@ -762,6 +762,11 @@ CONFIG_IPV6=m
##
# CONFIG_NET_MPLS_GSO is not set
##
## file: security/integrity/ima/Kconfig
##
# CONFIG_IMA is not set
##
## file: sound/soc/Kconfig
##
...
...
This diff is collapsed.
Click to expand it.
debian/config/config
+
15
−
1
View file @
f3c3de0f
...
...
@@ -6909,6 +6909,7 @@ CONFIG_SECURITY_APPARMOR_HASH=y
##
CONFIG_INTEGRITY=y
# CONFIG_INTEGRITY_SIGNATURE is not set
CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY_AUDIT=y
##
...
...
@@ -6919,7 +6920,20 @@ CONFIG_INTEGRITY_AUDIT=y
##
## file: security/integrity/ima/Kconfig
##
# CONFIG_IMA is not set
CONFIG_IMA=y
## choice: Default integrity hash algorithm
# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
# CONFIG_IMA_DEFAULT_HASH_WP512 is not set
## end choice
# CONFIG_IMA_WRITE_POLICY is not set
# CONFIG_IMA_READ_POLICY is not set
CONFIG_IMA_APPRAISE=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
CONFIG_IMA_BLACKLIST_KEYRING=y
# CONFIG_IMA_LOAD_X509 is not set
# CONFIG_IMA_APPRAISE_SIGNED_INIT is not set
##
## file: security/keys/Kconfig
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment