This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH v3 1/8] 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: Tue, 18 Sep 2018 11:54:37 -0700
- Subject: [PATCH v3 1/8] Use KF_PATH to verify the size of a struct kinfo_file.
- References: <20180918185444.89533-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 a468d8dc32..14ac0dae52 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-09-17 John Baldwin <jhb@FreeBSD.org>
+
+ * fbsd-tdep.c (fbsd_core_vnode_path): Use KF_PATH instead of
+ KVE_PATH.
+
2018-09-17 Philippe Waroquiers <philippe.waroquiers@skynet.be>
* python/lib/gdb/command/frame_filters.py (EnableFrameFilter):
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