From ab27f80c5dceaa23c4ba7f62c0d5d22a5d5dd7a1 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 27 Jun 2017 00:21:25 +0100 Subject: [PATCH] Fix GDB regressions caused by previous bfd_get_section_contents changes Ref: https://sourceware.org/ml/binutils/2017-06/msg00343.html bfd/ChangeLog: 2017-06-26 Pedro Alves PR binutils/21665 * libbfd.c (_bfd_generic_get_section_contents): Add "count", not "sz". Upstream-Status: Backport CVE: CVE-2017-9955 #4 Signed-off-by: Armin Kuster --- bfd/ChangeLog | 6 ++++++ bfd/libbfd.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) Index: git/bfd/ChangeLog =================================================================== --- git.orig/bfd/ChangeLog +++ git/bfd/ChangeLog @@ -1,3 +1,9 @@ +2017-06-26 Pedro Alves + + PR binutils/21665 + * libbfd.c (_bfd_generic_get_section_contents): Add "count", not + "sz". + 2017-06-26 H.J. Lu PR binutils/21665 Index: git/bfd/libbfd.c =================================================================== --- git.orig/bfd/libbfd.c +++ git/bfd/libbfd.c @@ -811,7 +811,7 @@ _bfd_generic_get_section_contents (bfd * } if (offset + count < count || offset + count > sz - || (section->filepos + offset + sz) > (bfd_size_type) filesz) + || (section->filepos + offset + count) > (bfd_size_type) filesz) { bfd_set_error (bfd_error_invalid_operation); return FALSE;