diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2016-08-05 01:20:51 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2016-08-05 01:24:26 -0700 |
| commit | fbaf37afa4ef87d3ea16983964383f287896e754 (patch) | |
| tree | 5db0899ef7d23d533a0a7c68789c65068dd2abc8 /Add-secure_modules-call.patch | |
| parent | 9e210819de8d61e4a79fa6aa4461843e15665c14 (diff) | |
| download | kernel-fbaf37afa4ef87d3ea16983964383f287896e754.tar.gz kernel-fbaf37afa4ef87d3ea16983964383f287896e754.tar.xz kernel-fbaf37afa4ef87d3ea16983964383f287896e754.zip | |
Linux v4.7-11891-gdd7fd3a
Diffstat (limited to 'Add-secure_modules-call.patch')
| -rw-r--r-- | Add-secure_modules-call.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Add-secure_modules-call.patch b/Add-secure_modules-call.patch index 5c272a983..1cbf3afd9 100644 --- a/Add-secure_modules-call.patch +++ b/Add-secure_modules-call.patch @@ -1,7 +1,7 @@ -From 0f6eec5ca124baf1372fb4edeacd11a002378f5e Mon Sep 17 00:00:00 2001 +From 3213f1513a744fb21b6b9e4d4f2650a204855b3e Mon Sep 17 00:00:00 2001 From: Matthew Garrett <matthew.garrett@nebula.com> Date: Fri, 9 Aug 2013 17:58:15 -0400 -Subject: [PATCH 01/20] Add secure_modules() call +Subject: [PATCH] Add secure_modules() call Provide a single call to allow kernel code to determine whether the system has been configured to either disable module loading entirely or to load @@ -17,10 +17,10 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com> 2 files changed, 16 insertions(+) diff --git a/include/linux/module.h b/include/linux/module.h -index 3daf2b3..082298a 100644 +index 0c3207d..05bd6c9 100644 --- a/include/linux/module.h +++ b/include/linux/module.h -@@ -655,6 +655,8 @@ static inline bool is_livepatch_module(struct module *mod) +@@ -641,6 +641,8 @@ static inline bool is_livepatch_module(struct module *mod) } #endif /* CONFIG_LIVEPATCH */ @@ -28,8 +28,8 @@ index 3daf2b3..082298a 100644 + #else /* !CONFIG_MODULES... */ - /* Given an address, look for it in the exception tables. */ -@@ -771,6 +773,10 @@ static inline bool module_requested_async_probing(struct module *module) + static inline struct module *__module_address(unsigned long addr) +@@ -750,6 +752,10 @@ static inline bool module_requested_async_probing(struct module *module) return false; } @@ -41,10 +41,10 @@ index 3daf2b3..082298a 100644 #ifdef CONFIG_SYSFS diff --git a/kernel/module.c b/kernel/module.c -index 5f71aa6..3c38496 100644 +index 529efae..0332fdd 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -4199,3 +4199,13 @@ void module_layout(struct module *mod, +@@ -4279,3 +4279,13 @@ void module_layout(struct module *mod, } EXPORT_SYMBOL(module_layout); #endif @@ -59,5 +59,5 @@ index 5f71aa6..3c38496 100644 +} +EXPORT_SYMBOL(secure_modules); -- -2.5.5 +2.9.2 |