8:03 a.m.
From: Rabin Vincent <rabinv(a)axis.com>
Add a missing continue after we check if note is NULL. Otherwise we
proceed and dereference the NULL pointer and segfault after printing the
"cannot find NT_PRSTATUS note for cpu" warning.
---
mips.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mips.c b/mips.c
index 5f74b7c..30e6255 100644
--- a/mips.c
+++ b/mips.c
@@ -939,9 +939,11 @@ static int mips_get_elf_notes(void)
else if (KDUMP_DUMPFILE())
note = netdump_get_prstatus_percpu(i);
- if (!note)
+ if (!note) {
error(WARNING,
"cannot find NT_PRSTATUS note for cpu: %d\n", i);
+ continue;
+ }
len = sizeof(Elf32_Nhdr);
len = roundup(len + note->n_namesz, 4);
--
2.1.4
8:03 a.m.
New subject: [PATCH 2/2] mips: fix __PGD_ORDER for >4KiB pages
From: Rabin Vincent <rabinv(a)axis.com>
PGD_ORDER expects __PGD_ORDER be signed, which it isn't now since
pagesize is unsigned. Without this, loading fails on a dump with a
kernel with 16 KiB pages:
please wait... (gathering module symbol data)
crash: invalid size request: 0 type: "pgd page"
---
mips.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mips.c b/mips.c
index 30e6255..f73dfad 100644
--- a/mips.c
+++ b/mips.c
@@ -28,7 +28,7 @@ typedef ulong pte_t;
#define PGD_T_LOG2 (__builtin_ffs(sizeof(pgd_t)) - 1)
#define PTE_T_LOG2 (__builtin_ffs(sizeof(pte_t)) - 1)
-#define __PGD_ORDER (32 - 3 * PAGESHIFT() + PGD_T_LOG2 + PTE_T_LOG2)
+#define __PGD_ORDER (32 - 3 * (int)PAGESHIFT() + PGD_T_LOG2 + PTE_T_LOG2)
#define PGD_ORDER (__PGD_ORDER >= 0 ? __PGD_ORDER : 0)
#define PGD_SIZE (PAGESIZE() << PGD_ORDER)
--
2.1.4
12:58 p.m.
New subject: [PATCH 2/2] mips: fix __PGD_ORDER for >4KiB pages
----- Original Message -----
From: Rabin Vincent <rabinv(a)axis.com>
PGD_ORDER expects __PGD_ORDER be signed, which it isn't now since
pagesize is unsigned. Without this, loading fails on a dump with a
kernel with 16 KiB pages:
please wait... (gathering module symbol data)
crash: invalid size request: 0 type: "pgd page"
---
mips.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mips.c b/mips.c
index 30e6255..f73dfad 100644
--- a/mips.c
+++ b/mips.c
@@ -28,7 +28,7 @@ typedef ulong pte_t;
#define PGD_T_LOG2 (__builtin_ffs(sizeof(pgd_t)) - 1)
#define PTE_T_LOG2 (__builtin_ffs(sizeof(pte_t)) - 1)
-#define __PGD_ORDER (32 - 3 * PAGESHIFT() + PGD_T_LOG2 + PTE_T_LOG2)
+#define __PGD_ORDER (32 - 3 * (int)PAGESHIFT() + PGD_T_LOG2 + PTE_T_LOG2)
#define PGD_ORDER (__PGD_ORDER >= 0 ? __PGD_ORDER : 0)
#define PGD_SIZE (PAGESIZE() << PGD_ORDER)
Rabin, thanks for your quick responses. Queued for crash-7.1.8:
https://github.com/crash-utility/crash/commit/ec02834f489a4bcc74eaedbaad6...
Dave
11:15 a.m.
----- Original Message -----
From: Rabin Vincent <rabinv(a)axis.com>
Add a missing continue after we check if note is NULL. Otherwise we
proceed and dereference the NULL pointer and segfault after printing the
"cannot find NT_PRSTATUS note for cpu" warning.
---
mips.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mips.c b/mips.c
index 5f74b7c..30e6255 100644
--- a/mips.c
+++ b/mips.c
@@ -939,9 +939,11 @@ static int mips_get_elf_notes(void)
else if (KDUMP_DUMPFILE())
note = netdump_get_prstatus_percpu(i);
- if (!note)
+ if (!note) {
error(WARNING,
"cannot find NT_PRSTATUS note for cpu: %d\n", i);
+ continue;
+ }
len = sizeof(Elf32_Nhdr);
len = roundup(len + note->n_namesz, 4);
--
2.1.4
--
Queued for crash-7.1.8:
https://github.com/crash-utility/crash/commit/c7a6b862ca65f216874e50b0d46...
Thanks,
Dave
3251
days inactive
3252
days old
devel@lists.crash-utility.osci.io
3 comments
2 participants
participants (2)
-
Dave Anderson -
Rabin Vincent