diff -Nru opendmarc-1.3.2/debian/changelog opendmarc-1.3.2/debian/changelog --- opendmarc-1.3.2/debian/changelog 2019-09-19 11:01:48.000000000 +0530 +++ opendmarc-1.3.2/debian/changelog 2021-04-25 13:36:57.000000000 +0530 @@ -1,3 +1,11 @@ +opendmarc (1.3.2-6+deb10u2) buster; urgency=medium + + * Non-maintainer upload by the LTS team. + * In opendmarc_xml_parse(), ensure NULL-termination of the buffer passed. + (Fixes: CVE-2020-12460) (Closes: #966464) + + -- Utkarsh Gupta Sun, 25 Apr 2021 13:36:57 +0530 + opendmarc (1.3.2-6+deb10u1) buster-security; urgency=high * CVE-2019-16378: https://github.com/trusteddomainproject/OpenDMARC/pull/48 diff -Nru opendmarc-1.3.2/debian/patches/CVE-2020-12460.patch opendmarc-1.3.2/debian/patches/CVE-2020-12460.patch --- opendmarc-1.3.2/debian/patches/CVE-2020-12460.patch 1970-01-01 05:30:00.000000000 +0530 +++ opendmarc-1.3.2/debian/patches/CVE-2020-12460.patch 2021-04-25 13:36:22.000000000 +0530 @@ -0,0 +1,39 @@ +From 50d28af25d8735504b6103537228ce7f76ad765f Mon Sep 17 00:00:00 2001 +From: "Murray S. Kucherawy" +Date: Wed, 5 Aug 2020 21:56:01 +0000 +Subject: [PATCH] In opendmarc_xml_parse(), ensure NULL-termination of the + buffer passed to opendmarc_xml(). + +--- + libopendmarc/opendmarc_xml.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/libopendmarc/opendmarc_xml.c ++++ b/libopendmarc/opendmarc_xml.c +@@ -158,7 +158,7 @@ + if (*cp != '<') + continue; + ++cp; +- for(sp = cp; *sp != '\0'; ++sp) ++ for (sp = cp; *sp != '\0'; ++sp) + { + if (*sp == '?') + break; +@@ -546,7 +546,7 @@ + if (fname == NULL) + { + xerror = errno; +- (void) snprintf(err_buf, err_len, "%s: %s", fname, "File name was NULL"); ++ (void) snprintf(err_buf, err_len, "%s", "File name was NULL"); + errno = EINVAL; + return NULL; + } +@@ -572,7 +572,7 @@ + return NULL; + } + +- bufp = calloc(statb.st_size, 1); ++ bufp = calloc(statb.st_size + 1, 1); + if (bufp == NULL) + { + xerror = errno; diff -Nru opendmarc-1.3.2/debian/patches/series opendmarc-1.3.2/debian/patches/series --- opendmarc-1.3.2/debian/patches/series 2019-09-19 10:59:54.000000000 +0530 +++ opendmarc-1.3.2/debian/patches/series 2021-04-25 13:36:32.000000000 +0530 @@ -12,3 +12,4 @@ ticket212.patch ticket227.patch pull48.patch +CVE-2020-12460.patch