File crash-find-kernel-configuration-data-with-kerne... of Package crash

Overview Repositories Revisions Requests Users Attributes Meta

File crash-find-kernel-configuration-data-with-kernel-5.1.patch of Package crash (Revision c20e779d48778010e944e261f32cd2da)

Currently displaying revision c20e779d48778010e944e261f32cd2da , Show latest

From: Dave Anderson <anderson@redhat.com>
Date: Tue, 26 Mar 2019 17:26:18 -0400
Subject: find kernel configuration data with kernel 5.1
Patch-mainline: 7.2.6
Git-commit: 9f168fb560bffe2116208cc1c947a95ef612f4fb

Fix to find the kernel configuration data in Linux 5.1 kernels
containing commit 13610aa908dcfce77135bb799c0a10d0172da6ba, titled
"kernel/configs: use .incbin directive to embed config_data.gz".
Without the patch, new kernels configured with CONFIG_IKCONFIG_PROC
will display "WARNING: could not find MAGIC_START!" during session
initialization, and also when running "sys config" during runtime.
(anderson@redhat.com)

---
 kernel.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

--- a/kernel.c
+++ b/kernel.c
@@ -10070,6 +10070,7 @@ read_in_kernel_config(int command)
 	struct syment *sp;
 	int ii, jj, ret, end, found=0;
 	unsigned long size, bufsz;
+	uint64_t magic;
 	char *pos, *ln, *buf, *head, *tail, *val, *uncomp;
 	char line[512];
 	z_stream stream;
@@ -10111,8 +10112,17 @@ again:
 	if (strstr(buf, MAGIC_START))
 		head = buf + MAGIC_SIZE + 10; /* skip past MAGIC_START and gzip header */
 	else {
-		error(WARNING, "could not find MAGIC_START!\n");
-		goto out2;
+		/*
+		 *  Later versions put the magic number before the compressed data.
+		 */
+		if (readmem(sp->value - 8, KVADDR, &magic, 8,
+            	    "kernel_config_data MAGIC_START", RETURN_ON_ERROR) &&
+		    STRNEQ(&magic, MAGIC_START)) {
+			head = buf + 10;
+		} else {
+			error(WARNING, "could not find MAGIC_START!\n");
+			goto out2;
+		}
 	}
 
 	tail = head;

Places

File crash-find-kernel-configuration-data-with-kernel-5.1.patch of Package crash (Revision c20e779d48778010e944e261f32cd2da)

Places