summaryrefslogtreecommitdiffstats
path: root/patches/0021-rh_taint-don-t-dereference-struct-module-without-CON.patch
diff options
authorJason A. Donenfeld <Jason@zx2c4.com>2020-11-04 10:05:06 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2020-11-04 10:05:06 +0100
commitbba0a075656b1ce9804f48451f11df3c5c005123 (patch)
treee99b611ebe293a6a9b5f3c08065aaccae7e1f310 /patches/0021-rh_taint-don-t-dereference-struct-module-without-CON.patch
parentNew patch for linux-3.10.0-1160.el7 (diff)
downloadrhel7-kernel-sanity-patcher-bba0a075656b1ce9804f48451f11df3c5c005123.tar.xz
rhel7-kernel-sanity-patcher-bba0a075656b1ce9804f48451f11df3c5c005123.zip
Add patch now that the rhel8.2 hack is gone from wg's qemu makefileHEADmaster
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'patches/0021-rh_taint-don-t-dereference-struct-module-without-CON.patch')
-rw-r--r--patches/0021-rh_taint-don-t-dereference-struct-module-without-CON.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/0021-rh_taint-don-t-dereference-struct-module-without-CON.patch b/patches/0021-rh_taint-don-t-dereference-struct-module-without-CON.patch
index 7316727..01ff870 100644
--- a/patches/0021-rh_taint-don-t-dereference-struct-module-without-CON.patch
+++ b/patches/0021-rh_taint-don-t-dereference-struct-module-without-CON.patch
@@ -1,7 +1,7 @@
From b5108aaf36105894a1412f73788afc3bfedd3071 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sun, 24 May 2020 19:28:07 -0600
-Subject: [PATCH 21/33] rh_taint: don't dereference struct module without
+Subject: [PATCH 21/34] rh_taint: don't dereference struct module without
CONFIG_MODULE
This structure isn't defined for !CONFIG_MODULE, so don't try to use it.
@@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2 files changed, 6 insertions(+)
diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
-index 560ca53a75fa..3425b352eac9 100644
+index 560ca53a75f..3425b352eac 100644
--- a/include/linux/moduleloader.h
+++ b/include/linux/moduleloader.h
@@ -45,7 +45,9 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
@@ -27,7 +27,7 @@ index 560ca53a75fa..3425b352eac9 100644
}
#endif
diff --git a/kernel/rh_taint.c b/kernel/rh_taint.c
-index 22f032431c96..bbd7f8a1ab29 100644
+index 22f032431c9..bbd7f8a1ab2 100644
--- a/kernel/rh_taint.c
+++ b/kernel/rh_taint.c
@@ -61,14 +61,18 @@ void mark_tech_preview(const char *msg, struct module *mod)
@@ -50,5 +50,5 @@ index 22f032431c96..bbd7f8a1ab29 100644
}
EXPORT_SYMBOL(mark_tech_preview);
--
-2.28.0
+2.29.1