diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-26 07:58:40 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-26 07:58:40 +0200 |
| commit | 348012821f7014b45577b6c34b7f895cd345c63a (patch) | |
| tree | 3ae03f632d74cc113c0752725e8ae75ac25dd9a9 /hibernate-Disable-in-a-signed-modules-environment.patch | |
| parent | 3d1f9b96026f06f1d6130a975ad9988c33dc3b0d (diff) | |
| parent | b43cd9971349391d46e3c71da0b041c7099d6c9a (diff) | |
| download | kernel-348012821f7014b45577b6c34b7f895cd345c63a.tar.gz kernel-348012821f7014b45577b6c34b7f895cd345c63a.tar.xz kernel-348012821f7014b45577b6c34b7f895cd345c63a.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc0.git8.1.vanilla.knurd.1.fc25kernel-4.7.0-0.rc0.git8.1.vanilla.knurd.1.fc24kernel-4.7.0-0.rc0.git8.1.vanilla.knurd.1.fc23kernel-4.7.0-0.rc0.git8.1.vanilla.knurd.1.fc22
Diffstat (limited to 'hibernate-Disable-in-a-signed-modules-environment.patch')
| -rw-r--r-- | hibernate-Disable-in-a-signed-modules-environment.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hibernate-Disable-in-a-signed-modules-environment.patch b/hibernate-Disable-in-a-signed-modules-environment.patch index f62ea08b0..bea2892ee 100644 --- a/hibernate-Disable-in-a-signed-modules-environment.patch +++ b/hibernate-Disable-in-a-signed-modules-environment.patch @@ -1,7 +1,7 @@ -From 51abecb00c48941cc3db19701cc73e65082924bb Mon Sep 17 00:00:00 2001 +From e07815cf02eadb245fa60359133b122f9ffe9045 Mon Sep 17 00:00:00 2001 From: Josh Boyer <jwboyer@fedoraproject.org> Date: Fri, 20 Jun 2014 08:53:24 -0400 -Subject: [PATCH 14/20] hibernate: Disable in a signed modules environment +Subject: [PATCH 3/9] hibernate: Disable in a signed modules environment There is currently no way to verify the resume image when returning from hibernate. This might compromise the signed modules trust model, @@ -14,7 +14,7 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c -index 690f78f210f2..037303a1cba9 100644 +index fca9254280ee..ffd8644078b2 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -29,6 +29,7 @@ @@ -35,5 +35,5 @@ index 690f78f210f2..037303a1cba9 100644 /** -- -2.4.3 +2.5.5 |