9:17 a.m.
v4.10-rc1 has simplified global and module taint flags handling. This
patchset caters corresponding modifications for crash utility.
v1->v2:
- changed as per comments from Dave Andersan for v1 patches.
- unnecessary checks removed
- also fixes for module taint flags changes now
Pratyush Anand (2):
Fix show_kernel_taints() for kernel version > 4.9
Fix show_module_taint() for kernel version > 4.9
defs.h | 2 +
kernel.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
symbols.c | 3 ++
3 files changed, 161 insertions(+)
--
2.7.4
9:17 a.m.
New subject: [PATCH V2 1/2] Fix show_kernel_taints() for kernel version > 4.9
Following kernel commit removed "struct tnt".
commit 7fd8329ba502ef76dd91db561c7aed696b2c7720
Author: Petr Mladek <pmladek(a)suse.com>
Date: Wed Sep 21 13:47:22 2016 +0200
taint/module: Clean up global and module taint flags handling
Now "struct taint_flag" has tainted character information.
Without this patch we see following error on a kernel version v4.10-rc1.
crash: invalid structure size: tnt
FILE: kernel.c LINE: 10459 FUNCTION: show_kernel_taints()
[./crash] error trace: 4cb49c => 4c7cd0 => 50f4e0 => 50f464
50f464: SIZE_verify.part.29+72
50f4e0: store_module_kallsyms_v1.part.30+0
4c7cd0: show_kernel_taints+352
4cb49c: is_livepatch+44
Signed-off-by: Pratyush Anand <panand(a)redhat.com>
---
defs.h | 1 +
kernel.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
symbols.c | 2 ++
3 files changed, 59 insertions(+)
diff --git a/defs.h b/defs.h
index 31a4dc490ed4..8f4c6e24bcc7 100644
--- a/defs.h
+++ b/defs.h
@@ -2120,6 +2120,7 @@ struct size_table { /* stash of commonly-used sizes */
long trace_print_flags;
long task_struct_flags;
long timer_base;
+ long taint_flag;
};
struct array_table {
diff --git a/kernel.c b/kernel.c
index bdd0d05eed97..cef8583ef503 100644
--- a/kernel.c
+++ b/kernel.c
@@ -10416,6 +10416,56 @@ dump_variable_length_record(void)
}
static void
+show_kernel_taints_v4_10(char *buf, int verbose)
+{
+ int i, bx;
+ char tnt_true, tnt_false;
+ int tnts_len;
+ ulong tnts_addr;
+ ulong tainted_mask, *tainted_mask_ptr;
+ struct syment *sp;
+
+ if (!VALID_STRUCT(taint_flag)) {
+ STRUCT_SIZE_INIT(taint_flag, "taint_flag");
+ MEMBER_OFFSET_INIT(tnt_true, "taint_flag", "true");
+ MEMBER_OFFSET_INIT(tnt_false, "taint_flag", "false");
+ }
+
+ tnts_len = get_array_length("taint_flags", NULL, 0);
+ sp = symbol_search("taint_flags");
+ tnts_addr = sp->value;
+
+ bx = 0;
+ buf[0] = '\0';
+
+ get_symbol_data("tainted_mask", sizeof(ulong), &tainted_mask);
+ tainted_mask_ptr = &tainted_mask;
+
+ for (i = 0; i < tnts_len; i++) {
+ if (NUM_IN_BITMAP(tainted_mask_ptr, i)) {
+ readmem((tnts_addr + i * SIZE(taint_flag)) +
+ OFFSET(tnt_true),
+ KVADDR, &tnt_true, sizeof(char),
+ "tnt true", FAULT_ON_ERROR);
+ buf[bx++] = tnt_true;
+ } else {
+ readmem((tnts_addr + i * SIZE(taint_flag)) +
+ OFFSET(tnt_false),
+ KVADDR, &tnt_false, sizeof(char),
+ "tnt false", FAULT_ON_ERROR);
+ if (tnt_false != ' ' && tnt_false != '-' &&
+ tnt_false != 'G')
+ buf[bx++] = tnt_false;
+ }
+ }
+
+ buf[bx++] = '\0';
+
+ if (verbose)
+ fprintf(fp, "TAINTED_MASK: %lx %s\n", tainted_mask, buf);
+}
+
+static void
show_kernel_taints(char *buf, int verbose)
{
int i, bx;
@@ -10427,6 +10477,12 @@ show_kernel_taints(char *buf, int verbose)
int tainted;
struct syment *sp;
+ if (kernel_symbol_exists("taint_flags") &&
+ STRUCT_EXISTS("taint_flag")) {
+ show_kernel_taints_v4_10(buf, verbose);
+ return;
+ }
+
if (!VALID_STRUCT(tnt)) {
STRUCT_SIZE_INIT(tnt, "tnt");
MEMBER_OFFSET_INIT(tnt_bit, "tnt", "bit");
diff --git a/symbols.c b/symbols.c
index b23807c4d6a0..7d66d9d1d0a4 100644
--- a/symbols.c
+++ b/symbols.c
@@ -10348,6 +10348,8 @@ dump_offset_table(char *spec, ulong makestruct)
SIZE(timer_base));
fprintf(fp, " tnt: %ld\n",
SIZE(tnt));
+ fprintf(fp, " taint_flag: %ld\n",
+ SIZE(taint_flag));
fprintf(fp, "\n array_table:\n");
/*
--
2.7.4
9:17 a.m.
New subject: [PATCH V2 2/2] Fix show_module_taint() for kernel version > 4.9
commit 7fd8329ba502ef76dd91db561c7aed696b2c7720 simplified module taint
flags handling. Modify crash code to cater the kernel changes.
Signed-off-by: Pratyush Anand <panand(a)redhat.com>
---
defs.h | 1 +
kernel.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
symbols.c | 1 +
3 files changed, 102 insertions(+)
diff --git a/defs.h b/defs.h
index 8f4c6e24bcc7..e45b667064a0 100644
--- a/defs.h
+++ b/defs.h
@@ -1977,6 +1977,7 @@ struct offset_table { /* stash of commonly-used
offsets */
long blk_mq_ctx_rq_dispatched;
long blk_mq_ctx_rq_completed;
long task_struct_stack;
+ long tnt_mod;
};
struct size_table { /* stash of commonly-used sizes */
diff --git a/kernel.c b/kernel.c
index cef8583ef503..56cfd99c4fbc 100644
--- a/kernel.c
+++ b/kernel.c
@@ -21,6 +21,7 @@
#include <elf.h>
#include <libgen.h>
#include <ctype.h>
+#include <stdbool.h>
static void do_module_cmd(ulong, char *, ulong, char *, char *);
static void show_module_taint(void);
@@ -3963,6 +3964,99 @@ check_specified_module_tree(char *module, char *gdb_buffer)
}
static void
+show_module_taint_4_10(void)
+{
+ int i, j, bx;
+ struct load_module *lm;
+ int maxnamelen;
+ int found;
+ char buf1[BUFSIZE];
+ char buf2[BUFSIZE];
+ struct syment *sp;
+ uint *taintsp, taints;
+ bool tnt_mod;
+ char tnt_true;
+ int tnts_len;
+ ulong tnts_addr;
+ char *modbuf;
+
+ if (INVALID_MEMBER(module_taints)) {
+ MEMBER_OFFSET_INIT(module_taints, "module", "taints");
+ STRUCT_SIZE_INIT(taint_flag, "taint_flag");
+ MEMBER_OFFSET_INIT(tnt_true, "taint_flag", "true");
+ MEMBER_OFFSET_INIT(tnt_mod, "taint_flag", "module");
+ }
+
+ modbuf = GETBUF(SIZE(module));
+
+ for (i = found = maxnamelen = 0; i < kt->mods_installed; i++) {
+ lm = &st->load_modules[i];
+
+ readmem(lm->module_struct, KVADDR, modbuf, SIZE(module),
+ "module struct", FAULT_ON_ERROR);
+
+ taints = ULONG(modbuf + OFFSET(module_taints));
+
+ if (taints) {
+ found++;
+ maxnamelen = strlen(lm->mod_name) > maxnamelen ?
+ strlen(lm->mod_name) : maxnamelen;
+ }
+ }
+
+ if (!found) {
+ fprintf(fp, "no tainted modules\n");
+ FREEBUF(modbuf);
+ return;
+ }
+
+ tnts_len = get_array_length("taint_flags", NULL, 0);
+ sp = symbol_search("taint_flags");
+ tnts_addr = sp->value;
+
+ fprintf(fp, "%s %s\n",
+ mkstring(buf2, maxnamelen, LJUST, "NAME"), "TAINTS");
+
+ for (i = 0; i < st->mods_installed; i++) {
+
+ lm = &st->load_modules[i];
+ bx = 0;
+ buf1[0] = '\0';
+
+ readmem(lm->module_struct, KVADDR, modbuf, SIZE(module),
+ "module struct", FAULT_ON_ERROR);
+
+ taints = ULONG(modbuf + OFFSET(module_taints));
+ if (!taints)
+ continue;
+ taintsp = &taints;
+
+ for (j = 0; j < tnts_len; j++) {
+ readmem((tnts_addr + j * SIZE(taint_flag)) +
+ OFFSET(tnt_mod),
+ KVADDR, &tnt_mod, sizeof(bool),
+ "tnt mod", FAULT_ON_ERROR);
+ if (!tnt_mod)
+ continue;
+ if (NUM_IN_BITMAP(taintsp, j)) {
+ readmem((tnts_addr + j * SIZE(taint_flag)) +
+ OFFSET(tnt_true),
+ KVADDR, &tnt_true, sizeof(char),
+ "tnt true", FAULT_ON_ERROR);
+ buf1[bx++] = tnt_true;
+ }
+ }
+
+ buf1[bx++] = '\0';
+
+ fprintf(fp, "%s %s\n", mkstring(buf2, maxnamelen,
+ LJUST, lm->mod_name), buf1);
+ }
+
+ FREEBUF(modbuf);
+}
+
+static void
show_module_taint(void)
{
int i, j, bx;
@@ -3980,6 +4074,12 @@ show_module_taint(void)
ulong tnts_addr;
char *modbuf;
+ if (kernel_symbol_exists("taint_flags") &&
+ STRUCT_EXISTS("taint_flag")) {
+ show_module_taint_4_10();
+ return;
+ }
+
if (INVALID_MEMBER(module_taints) &&
INVALID_MEMBER(module_license_gplok)) {
MEMBER_OFFSET_INIT(module_taints, "module", "taints");
diff --git a/symbols.c b/symbols.c
index 7d66d9d1d0a4..ceeba709ae5e 100644
--- a/symbols.c
+++ b/symbols.c
@@ -8897,6 +8897,7 @@ dump_offset_table(char *spec, ulong makestruct)
fprintf(fp, " tnt_bit: %ld\n", OFFSET(tnt_bit));
fprintf(fp, " tnt_true: %ld\n", OFFSET(tnt_true));
fprintf(fp, " tnt_false: %ld\n", OFFSET(tnt_false));
+ fprintf(fp, " tnt_mod: %ld\n", OFFSET(tnt_mod));
fprintf(fp, " page_next: %ld\n", OFFSET(page_next));
fprintf(fp, " page_prev: %ld\n", OFFSET(page_prev));
--
2.7.4
2:01 p.m.
New subject: [PATCH V2 0/2] Fix for global and module taint flags changes in kernel
----- Original Message -----
v4.10-rc1 has simplified global and module taint flags handling. This
patchset caters corresponding modifications for crash utility.
v1->v2:
- changed as per comments from Dave Andersan for v1 patches.
- unnecessary checks removed
- also fixes for module taint flags changes now
Pratyush Anand (2):
Fix show_kernel_taints() for kernel version > 4.9
Fix show_module_taint() for kernel version > 4.9
defs.h | 2 +
kernel.c | 156
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
symbols.c | 3 ++
3 files changed, 161 insertions(+)
--
2.7.4
Pratyush,
Looks good and tests OK -- queued for crash-7.1.8:
https://github.com/crash-utility/crash/commit/24a696228c56fd4354d29abe05b...
Thanks again for addressing this so quickly -- much appreciated.
Dave
2739
days inactive
2739
days old
devel@lists.crash-utility.osci.io
3 comments
2 participants
participants (2)
-
Dave Anderson -
Pratyush Anand