This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH v2 1/6] Use KF_PATH to verify the size of a struct kinfo_file.
- From: John Baldwin <jhb at FreeBSD dot org>
- To: gdb-patches at sourceware dot org
- Date: Wed, 12 Sep 2018 16:37:02 -0700
- Subject: [PATCH v2 1/6] Use KF_PATH to verify the size of a struct kinfo_file.
- References: <20180912233707.43492-1-jhb@FreeBSD.org>
fbsd_core_vnode_path needs to use the offset of the kf_path member of
struct kinfo_file as the minimum size of a struct kinfo_file object.
However, it was using KVE_PATH instead due to a copy and paste bug.
While here, fix another copy and paste bug in the error message for a
truncated kinfo_file object.
gdb/ChangeLog:
* fbsd-tdep.c (fbsd_core_vnode_path): Use KF_PATH instead of
KVE_PATH.
---
gdb/ChangeLog | 5 +++++
gdb/fbsd-tdep.c | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 454c45f9ad..d602e63eb0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-09-12 John Baldwin <jhb@FreeBSD.org>
+
+ * fbsd-tdep.c (fbsd_core_vnode_path): Use KF_PATH instead of
+ KVE_PATH.
+
2018-09-12 John Baldwin <jhb@FreeBSD.org>
* fbsd-nat.c (fbsd_nat_target::info_proc): Remove unused variable.
diff --git a/gdb/fbsd-tdep.c b/gdb/fbsd-tdep.c
index ed43087169..48544b5370 100644
--- a/gdb/fbsd-tdep.c
+++ b/gdb/fbsd-tdep.c
@@ -781,13 +781,13 @@ fbsd_core_vnode_path (struct gdbarch *gdbarch, int fd)
/* Skip over the structure size. */
descdata += 4;
- while (descdata + KVE_PATH < descend)
+ while (descdata + KF_PATH < descend)
{
ULONGEST structsize;
structsize = bfd_get_32 (core_bfd, descdata + KF_STRUCTSIZE);
- if (structsize < KVE_PATH)
- error (_("malformed core note - vmmap entry too small"));
+ if (structsize < KF_PATH)
+ error (_("malformed core note - file structure too small"));
if (bfd_get_32 (core_bfd, descdata + KF_TYPE) == KINFO_FILE_TYPE_VNODE
&& bfd_get_signed_32 (core_bfd, descdata + KF_FD) == fd)
--
2.18.0