3843. [protocol] Check EDNS EXPIRE option in dns_rdata_fromwire.

                        [RT #35969]

Conflicts:
	CHANGES

diff --git a/CHANGES b/CHANGES
index 899b2c26f9f39f70791abf83f92426572303a685..22546461b433ce43936b4ffb637cc968b1e5fe32 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
                        Redistributable when built for 64 bit Windows.
                        (Thanks to Giovanni Paterno.) [RT #35973]
 
+3843.  [protocol]      Check EDNS EXPIRE option in dns_rdata_fromwire.
+                       [RT #35969]
+
 3842.  [bug]           Adjust RRL log-only logging category. [RT #35945]
 
 3841.  [cleanup]       Refactor zone.c:add_opt to use dns_message_buildopt.

diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c
index 207639677256539528a38b851bb8bf5a81c037ec..ae09abf71e91460a8a80b6ff02a01c325f13a4a9 100644 (file)
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -151,13 +151,14 @@ fromwire_opt(ARGS_FROMWIRE) {
                        isc_region_consume(&sregion, addrbytes);
                        break;
                }
-#ifdef notyet
                case DNS_OPT_EXPIRE:
+                       /*
+                        * Request has zero length.  Response is 32 bits.
+                        */
                        if (length != 0 && length != 4)
                                return (DNS_R_FORMERR);
                        isc_region_consume(&sregion, length);
                        break;
-#endif
                default:
                        isc_region_consume(&sregion, length);
                        break;