3621. [security] Incorrect bounds checking on private type 'keydata'

                        can lead to a remotely triggerable REQUIRE failure
                        (CVE-2013-4854). [RT #34238]

(cherry picked from commit fdb4ae8f6c00d8ea03bde929bd4e47056972017d)

diff --git a/CHANGES b/CHANGES
index 875cfaf25dc7eb029a47f3fc87ce6e85774dd4bd..96d1d7e869ac9fcda2c46aab16a6014c80b8a7a0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
        --- 9.9.4rc1 released ---
 
+3621.  [security]      Incorrect bounds checking on private type 'keydata'
+                       can lead to a remotely triggerable REQUIRE failure
+                       (CVE-2013-4854). [RT #34238]
+
 3617.  [bug]           Named was failing to answer queries during
                        "rndc reload" [RT #34098]
 

diff --git a/lib/dns/rdata/generic/keydata_65533.c b/lib/dns/rdata/generic/keydata_65533.c
index 46bf6fce201ff63d34159e7bae42990259370436..a2d83f456e49364d922b9e4d01a15564ab697261 100644 (file)
--- a/lib/dns/rdata/generic/keydata_65533.c
+++ b/lib/dns/rdata/generic/keydata_65533.c
@@ -194,7 +194,7 @@ fromwire_keydata(ARGS_FROMWIRE) {
        UNUSED(options);
 
        isc_buffer_activeregion(source, &sr);
-       if (sr.length < 4)
+       if (sr.length < 16)
                return (ISC_R_UNEXPECTEDEND);
 
        isc_buffer_forward(source, sr.length);