{"id":810837,"url":"http://patchwork.ozlabs.org/api/patches/810837/?format=json","web_url":"http://patchwork.ozlabs.org/project/lede/patch/1504753103-8907-1-git-send-email-ldir@darbyshire-bryant.me.uk/","project":{"id":54,"url":"http://patchwork.ozlabs.org/api/projects/54/?format=json","name":"LEDE development","link_name":"lede","list_id":"lede-dev.lists.infradead.org","list_email":"lede-dev@lists.infradead.org","web_url":"http://lede-project.org/","scm_url":"","webscm_url":"http://git.lede-project.org/","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504753103-8907-1-git-send-email-ldir@darbyshire-bryant.me.uk>","list_archive_url":null,"date":"2017-09-07T02:58:23","name":"[LEDE-DEV] dnsmasq: backport official fix for CVE-2017-13704","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"e43c7a40a656e09fb8ed02229fab4e7fae79f874","submitter":{"id":72287,"url":"http://patchwork.ozlabs.org/api/people/72287/?format=json","name":"Kevin 'ldir' Darbyshire-Bryant","email":"ldir@darbyshire-bryant.me.uk"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/lede/patch/1504753103-8907-1-git-send-email-ldir@darbyshire-bryant.me.uk/mbox/","series":[{"id":1902,"url":"http://patchwork.ozlabs.org/api/series/1902/?format=json","web_url":"http://patchwork.ozlabs.org/project/lede/list/?series=1902","date":"2017-09-07T02:58:23","name":"[LEDE-DEV] dnsmasq: backport official fix for CVE-2017-13704","version":1,"mbox":"http://patchwork.ozlabs.org/series/1902/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810837/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810837/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org; spf=none (mailfrom)\n\tsmtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133;\n\thelo=bombadil.infradead.org;\n\tenvelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org header.b=\"bgybk162\"; \n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=darbyshire-bryant.me.uk\n\theader.i=@darbyshire-bryant.me.uk header.b=\"hIHc+4bH\"; \n\tdkim-atps=neutral","spf=none (sender IP is )\n\tsmtp.mailfrom=kevin@darbyshire-bryant.me.uk; "],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[65.50.211.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xnlYF4y8Dz9rxm\n\tfor ;\n\tThu, 7 Sep 2017 12:59:42 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dpn2F-0003bK-Cl; Thu, 07 Sep 2017 02:59:19 +0000","from mail-he1eur01on0064.outbound.protection.outlook.com\n\t([104.47.0.64] helo=EUR01-HE1-obe.outbound.protection.outlook.com)\n\tby bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dpn1o-0003Tw-IN\n\tfor lede-dev@lists.infradead.org; Thu, 07 Sep 2017 02:58:55 +0000","from Animal.darbyshire-bryant.me.uk (2a02:c7f:1232:220::fb0e) by\n\tVI1PR07MB1039.eurprd07.prod.outlook.com (2a01:111:e400:5096::15) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.35.3;\n\tThu, 7 Sep 2017 02:58:27 +0000"],"DKIM-Signature":["v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To\n\t:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:\n\tResent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:\n\tList-Owner; bh=BwN7EcGtaBFmdGd/F7RmPd8Gy5tVV5gY01+ALz27JCg=;\n\tb=bgybk1628sqKZg\n\tZknbytp/8xThTo1jxW+zn7CqqMmJ6aXMjr/6cs+8Mi+cnSQt2KZaVZ4OI3uaKqp/02bkd+WCskii8\n\tNDvRiHnStWx3KCJZBgBU3sYm0Jg8gmjlCfzJoSgCnU+5RQY24A0vKRNTYGa0GgfHHNrCbYLEKYdXR\n\tYr+9xYrQHaR/U7+wyExGhW97oZMZD60H8EZ2uiFIsd4lhgkXdGQjsSrF7GCuwOtAg4YlHv+rtyNPz\n\tBiUFBMfcoZNEEH4b0NqzeR3f1yt/oqA5Aqi4Vev9EtBdZ4TzoeMxndFYFY80HECcQ0ntAf4Q1CVnd\n\t2nIpqtHQd3HM31KzFB5Q==;","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=darbyshire-bryant.me.uk; s=selector1;\n\th=From:Date:Subject:Message-ID:Content-Type:MIME-Version;\n\tbh=mF4qU9Mqj+VlGqOh3caGlXpJ7QuN1FvPKTgtdiP+9G8=;\n\tb=hIHc+4bH++gviGzFw0w0RYiUl3ugKPUXAPjPndFfcp2We9vJ4Ee1Oe9qJP1FHDC7PdLurvFFdTRiL2mzVIHFC6bmuzzc2rgz639Lu0WHclzG6kgqfylO4+C1DPB2hhpsB/d8+o0P6bvhg0osHf3295fcmFEbXapyP/4hJULYf5Y="],"From":"Kevin Darbyshire-Bryant ","To":"lede-dev@lists.infradead.org","Date":"Thu, 7 Sep 2017 03:58:23 +0100","Message-Id":"<1504753103-8907-1-git-send-email-ldir@darbyshire-bryant.me.uk>","X-Mailer":"git-send-email 2.7.4","MIME-Version":"1.0","X-Originating-IP":"[2a02:c7f:1232:220::fb0e]","X-ClientProxiedBy":"DB6PR07CA0056.eurprd07.prod.outlook.com\n\t(2603:10a6:6:2a::18) To VI1PR07MB1039.eurprd07.prod.outlook.com\n\t(2a01:111:e400:5096::15)","X-MS-PublicTrafficType":"Email","X-MS-Office365-Filtering-Correlation-Id":"b342bf04-3faa-400b-210b-08d4f59c507f","X-Microsoft-Antispam":"UriScan:; BCL:0; PCL:0;\n\tRULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(2017082002075)(300000503095)(300135400095)(201703131423075)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);\n\tSRVR:VI1PR07MB1039; ","X-Microsoft-Exchange-Diagnostics":["1; VI1PR07MB1039;\n\t3:c2a+/8rI5BvmhaNyLcep7DHSuA8Vx/slD54dSG2dtixKD+psD0qxP+P+4IvGr2GgGm1fr6KC3YrCDcHdF8Rc7mqMyx9ePDJDo11FTnaFeTF3mxa2oK5i6hLpx/QfwmU7koIyRodtPy9mckzjFi6za4STlANaq7V9u0BM0L1AKnxdFjMh/sSYTvhAkiW6/682eBpFkQwlLujFZJ9aVjYM9ocFi/6Yb7zkEmrK2Piix79ctStG0vdYOXeWQoMPr03V;\n\t25:fLnC2GoUYhezFoeiM2Zze1FN7Dz5rU030tyoBgksMJOAlc4lCazbY74voc7ZlPnwZHIngv6F/CPKoFkYaSgDqVdJGq2GLC4n601xWWNgDq7PDWvntR8p440ACG438xmlJEWtXDmmGBjgAuiQ8TvFW5yAg7RiZRCHuDoDOl9kFPD6rapnt6t7O82UjQLnG89OIxldvNcYsm2R7AmIMPJuZcE3kpYTnUzq1gdSXfjiwQ0HTx6i3zb6qmPqJu8H1ujDq1q/XNB+5rtm59UITmKYb8ZbNSisaDd2MwurthgV3YqjXCp6YGq6ogGLMIz/G5EcidYi/ToEforF8gR0E6yLvw==;\n\t31:i1dBeKmIoIUZ5pz9A16u34dHMr2okG3jQNxQD43mzxl4/RoSIZ8cxJGIc3N5tppQfwI51icXuHKRpUpnnvwITWiL9XNOhrWso6vwUu5Ym+kXubmpyHVqjM1P4uSCdEbzeZ1x1YdWYGUGcYfWXDpmThMG8pzsQxomaUPa3exeNM9Iqv79tP06z6LN0V3A7t7S1fc3aJSU4oXdW2iafiWKx/DbitnsBmFoLSxeu4Xz6Q4=","1; VI1PR07MB1039;\n\t4:qld5XohDWhxSczd73Lijz4iPvnIA5HCIuBNk+8KLgfeOcnxXLpK5sqROrPQJAWoHUyRo3CCC4qfLRnTuFnwmmvwkhZwh5tU9lioSbR0YsctNBfQ0lSRWZoih4yDcJrPDeoS4lYcWUHH55ZJLHJFxhXdYAKGNo6nnHbyO9fAhzEPLNzXUnQgFiJ61nMr6oyxkJofoIeLtrVfDKQlKg1FySk8bK5r4kUvCu4px7O53mp5NYVWoeg41QhUjvZpxjE4YXsepcnhi6UwoL17CrpMR7GdKdJfxYXHXEMEN0s/sFGQ=","=?us-ascii?Q?1; VI1PR07MB1039;\n\t23:Ww3G6pyQxy5uRfdr/2x7wjjSmmPJIHbaB2ihy6gqN?=\n\t/wwmU18mBG2Zuczo9LvvPPDKDr4AFbi5gEqMUFE0LxS6IHxXwuHe/A2Pclbwq7NZUXduI4M4E9sxBFCVjPWGZwn4Bitrxs9MpEsb8R6kDyvGXtvV/8HjhxV9iVR5pYKwurVipF6uBxZC5FOWRwdcJQ8uFRdPs91A5q/uHKN/87Q0kc5Vvyb67hRNk9PpXsxosABEZS9sFttZ3JAT+HP1aVvLkyWd2nFOSlGsSRZcY677hCNQjQbYx0UPAQpzw/XBXED053QiQKvGe/3IEA+c0wYO7gayp3O1dmD92FqD6ZDuko2NaN9iEp0HMZNlCfzd6/WJIHGyJtuVRsaucbJ+VRQcMSt30Ph/cvo9pw9CTCbRsi/Kb/f+DG6cNDNDYza9VKxaZf8Iuwz6TmAHbqcFy5VF+OWEQmcH4uSeE768BjapyhZDxaUr3RbBpD/gh38aVkp1DdPzk8oFGdapd1Clzo1vHA/b93Ck+d8tuP9/brGjTkMLhkGLMt8XT6FPw4D4DL51XfDaFzlDI8x26YlWU7mVL0H6ttbgw8mMIEoMH3dJ9X50xWUL1ByY5PglEmwF8HNvlapupPu2hBE5ODCkf2cQj/zCFyMBUHdznR52XO0ZsYXADSO4+OkiT6TfnfHB5VqkNr5iz85OF5JJkGuYDYlUu3bDN4d5da3A1AcLd2eWywQNfhaIYOSExU8CK7uFpIDug5EwkBzlFUOLjK/Naq8sxfNWd0DhdowmHPb4QW2XQwG6XHbQUTvlWhr5UWkrlJuY9ORHkeL6BznZTcdW9yn+p6cHHh2qSuyIE6r/jQH9tztJlGSUVSu0iXGYbO+baLv4wsCTQttX8nfgYPhfTWy3A5fGLkkD2v+2Ika8E4+xGjRE/ctlA//9Fj0s6FoYhu7Jorw3KnINdETRbJimt6Y5sokDtaDH6yMoY330fOK8z3X7YzJm9mwoDqs4xEiF+AY+8L5iBhQmbj1hWQ9SbJvzqfABcVWdqyBFfYLQI03Dxv437Ik5EPEpQMlPjFQwroY6MXVTMhsHeWBX3F0nDJCorcTHxafd64ZEcxe75U9q2S7IqExiFZzt45iaKEzjLd8sxVfDgYEQSNO90eWGf09PnjfObJwrXxuQhcD4A16SHwlgPtpRBvKyF0S3UbKtLM=","1; VI1PR07MB1039;\n\t6:A9W/2ikPjQYQFarjnhY057aJOT3QdLwssnJ9q+aMJfShtiGxrZRb8i48evmYtV/Pq3J18kenb/wVZxsT6oLRu1riV8m/roAMlYCH5XdDd2MLQPyrgGpHKPVy2fRd1WOaH/Eq+arOVY/a/vSNtlCJCKr4HcsRpJ0xPMYnhZ5Fng0SdhYJhF8ge7BFher3aL7xVwBJWOSkayZfmbCPj5vwsf+msJSpM6K9pPU8slaf02CoTArIxGUQctHgDb0AdZBE+baCjXJhmYFutIWbCJF6EefL3yoeNvz+rw0RJ9dzdWM3KJRXEbe8yBtEHxUJqrNsE5ADmocHcp63orzae5WtyA==;\n\t5:NsRBkfYgHRBS1eq77iT13pO5epqMxCfgbjAEOzzHmp0LFzWo/aYMYPB4ZUohCFpJs2D8lm2Ego1PC/GpDVBraoiDJ4tUbQFEQcIIbiViADPDnHKDWFq62Nb5G0P9GXFtUwEDQJ2sekYDT2hhBahsfQ==;\n\t24:2lljZwzHNC2vJa2aOVpFAK715iVsr5fL7jp9MgOUGzG9X82uiefUPbiphRZR2+TqSQrEXkNFzJ5Dc+2KavLthFB1bpgRjJxDVcwKtD91oGw=;\n\t7:x7KQUeX60j6xQc6DzuoPjk7RCgOU+lUrn5J7BPGcvko9q8pCuqA0ufcUJiEwDgEux+oyFML2yZHPOlxQJErhQzkC4w498v8SAtD1egXQTXOnDEUqjTKu/b7zgoyHJg91N3h0g8PuZifd1iUfOOJb2AC0sy1/pzhmkdNkkePbGSfLxI0XpdXlo/TOJ3h083jbLrmRTXLrcOcrXuz5EfV9Mi/r0x3yfr3T8z8PAK2kHyA="],"X-MS-TrafficTypeDiagnostic":"VI1PR07MB1039:","X-Exchange-Antispam-Report-Test":"UriScan:(192374486261705);","X-Microsoft-Antispam-PRVS":"","X-Exchange-Antispam-Report-CFA-Test":"BCL:0; PCL:0;\n\tRULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(100000703101)(100105400095)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(20161123558100)(20161123555025)(2016111802025)(6043046)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);\n\tSRVR:VI1PR07MB1039; BCL:0; PCL:0;\n\tRULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);\n\tSRVR:VI1PR07MB1039; ","X-Forefront-PRVS":"04238CD941","X-Forefront-Antispam-Report":"SFV:NSPM;\n\tSFS:(10009020)(4630300001)(7370300001)(6009001)(39830400002)(189002)(199003)(54534003)(47776003)(48376002)(36756003)(50986999)(575784001)(50466002)(74482002)(189998001)(53416004)(81156014)(81166006)(106356001)(50226002)(105586002)(101416001)(7736002)(5003940100001)(42186005)(305945005)(8676002)(230783001)(6116002)(97736004)(2351001)(2361001)(478600001)(33646002)(2906002)(42882006)(6916009)(69596002)(6666003)(5660300001)(4326008)(68736007)(25786009)(110136004)(6486002)(107886003)(7350300001)(53936002);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR07MB1039;\n\tH:Animal.darbyshire-bryant.me.uk; \n\tFPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; ","Received-SPF":"None (protection.outlook.com: darbyshire-bryant.me.uk does not\n\tdesignate permitted sender hosts)","SpamDiagnosticOutput":"1:99","SpamDiagnosticMetadata":"NSPM","X-OriginatorOrg":"darbyshire-bryant.me.uk","X-MS-Exchange-CrossTenant-OriginalArrivalTime":"07 Sep 2017 02:58:27.7950\n\t(UTC)","X-MS-Exchange-CrossTenant-FromEntityHeader":"Hosted","X-MS-Exchange-Transport-CrossTenantHeadersStamped":"VI1PR07MB1039","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20170906_195853_062194_93E07AD4 ","X-CRM114-Status":"GOOD ( 15.21 )","X-Spam-Score":"-2.0 (--)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-2.0 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/,\n\tno trust [104.47.0.64 listed in list.dnswl.org]\n\t-0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4)\n\t[104.47.0.64 listed in wl.mailspike.net]\n\t-0.0 SPF_PASS SPF: sender matches SPF record\n\t-0.0 SPF_HELO_PASS SPF: HELO matches SPF record\n\t-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n\t[score: 0.0000]\n\t-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature\n\t0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n\tnot necessarily valid\n\t-0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n\tauthor's\n\tdomain -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders","Subject":"[LEDE-DEV] [PATCH] dnsmasq: backport official fix for CVE-2017-13704","X-BeenThere":"lede-dev@lists.infradead.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Kevin Darbyshire-Bryant ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"Lede-dev\" ","Errors-To":"lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"},"content":"Remove LEDE partial fix for CVE-2017-13704.\n\nBackport official fix from upstream.\n\nSigned-off-by: Kevin Darbyshire-Bryant \n---\nPlease cherrypick to LEDE 17.01\n\n .../patches/025-backport-fix-CVE-2017-13704.patch | 94 ++++++++++++++++++++++\n .../dnsmasq/patches/025-fix-CVE-2017-13704.patch | 37 ---------\n 2 files changed, 94 insertions(+), 37 deletions(-)\n create mode 100644 package/network/services/dnsmasq/patches/025-backport-fix-CVE-2017-13704.patch\n delete mode 100644 package/network/services/dnsmasq/patches/025-fix-CVE-2017-13704.patch","diff":"diff --git a/package/network/services/dnsmasq/patches/025-backport-fix-CVE-2017-13704.patch b/package/network/services/dnsmasq/patches/025-backport-fix-CVE-2017-13704.patch\nnew file mode 100644\nindex 0000000..bba9a08\n--- /dev/null\n+++ b/package/network/services/dnsmasq/patches/025-backport-fix-CVE-2017-13704.patch\n@@ -0,0 +1,94 @@\n+From 63437ffbb58837b214b4b92cb1c54bc5f3279928 Mon Sep 17 00:00:00 2001\n+From: Simon Kelley \n+Date: Wed, 6 Sep 2017 22:34:21 +0100\n+Subject: [PATCH] Fix CVE-2017-13704, which resulted in a crash on a large DNS\n+ query.\n+\n+A DNS query recieved by UDP which exceeds 512 bytes (or the EDNS0 packet size,\n+if different.) is enough to cause SIGSEGV.\n+---\n+ CHANGELOG | 7 +++++++\n+ src/auth.c | 5 -----\n+ src/forward.c | 8 ++++++++\n+ src/rfc1035.c | 5 -----\n+ 4 files changed, 15 insertions(+), 10 deletions(-)\n+\n+diff --git a/CHANGELOG b/CHANGELOG\n+index 3a640f3..7e65912 100644\n+--- a/CHANGELOG\n++++ b/CHANGELOG\n+@@ -17,6 +17,13 @@ version 2.78\n+ \t--strict-order active. Thanks to Hans Dedecker\n+ \tfor the patch\n+ \n++\tFix regression in 2.77, ironically added as a security\n++\timprovement, which resulted in a crash when a DNS\n++\tquery exceeded 512 bytes (or the EDNS0 packet size,\n++\tif different.) Thanks to Christian Kujau, Arne Woerner\n++\tJuan Manuel Fernandez and Kevin Darbyshire-Bryant for\n++\tchasing this one down. CVE-2017-13704 applies.\n++\n+ \t\n+ version 2.77\n+ \tGenerate an error when configured with a CNAME loop,\n+diff --git a/src/auth.c b/src/auth.c\n+index 2c24e16..7f95f98 100644\n+--- a/src/auth.c\n++++ b/src/auth.c\n+@@ -119,11 +119,6 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n\n+ struct cname *a, *candidate;\n+ unsigned int wclen;\n+ \n+- /* Clear buffer beyond request to avoid risk of\n+- information disclosure. */\n+- memset(((char *)header) + qlen, 0, \n+-\t (limit - ((char *)header)) - qlen);\n+- \n+ if (ntohs(header->qdcount) == 0 || OPCODE(header) != QUERY )\n+ return 0;\n+ \n+diff --git a/src/forward.c b/src/forward.c\n+index f22556a..e3fa94b 100644\n+--- a/src/forward.c\n++++ b/src/forward.c\n+@@ -1188,6 +1188,10 @@ void receive_query(struct listener *listen, time_t now)\n+ (msg.msg_flags & MSG_TRUNC) ||\n+ (header->hb3 & HB3_QR))\n+ return;\n++\n++ /* Clear buffer beyond request to avoid risk of\n++ information disclosure. */\n++ memset(daemon->packet + n, 0, daemon->edns_pktsz - n);\n+ \n+ source_addr.sa.sa_family = listen->family;\n+ \n+@@ -1688,6 +1692,10 @@ unsigned char *tcp_request(int confd, time_t now,\n+ \n+ if (size < (int)sizeof(struct dns_header))\n+ \tcontinue;\n++\n++ /* Clear buffer beyond request to avoid risk of\n++\t information disclosure. */\n++ memset(payload + size, 0, 65536 - size);\n+ \n+ query_count++;\n+ \n+diff --git a/src/rfc1035.c b/src/rfc1035.c\n+index 26f5301..af2fe46 100644\n+--- a/src/rfc1035.c\n++++ b/src/rfc1035.c\n+@@ -1223,11 +1223,6 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,\n+ struct mx_srv_record *rec;\n+ size_t len;\n+ \n+- /* Clear buffer beyond request to avoid risk of\n+- information disclosure. */\n+- memset(((char *)header) + qlen, 0, \n+-\t (limit - ((char *)header)) - qlen);\n+- \n+ if (ntohs(header->ancount) != 0 ||\n+ ntohs(header->nscount) != 0 ||\n+ ntohs(header->qdcount) == 0 || \n+-- \n+1.7.10.4\n+\ndiff --git a/package/network/services/dnsmasq/patches/025-fix-CVE-2017-13704.patch b/package/network/services/dnsmasq/patches/025-fix-CVE-2017-13704.patch\ndeleted file mode 100644\nindex 8848131..0000000\n--- a/package/network/services/dnsmasq/patches/025-fix-CVE-2017-13704.patch\n+++ /dev/null\n@@ -1,37 +0,0 @@\n-From 38af9b1ac3242a4128e88069c495024caa565f0e Mon Sep 17 00:00:00 2001\n-From: Kevin Darbyshire-Bryant \n-Date: Tue, 29 Aug 2017 12:35:40 +0100\n-Subject: [PATCH] forward.c: fix CVE-2017-13704\n-\n-Fix SIGSEGV in rfc1035.c answer_request() line 1228 where memset()\n-is called with header & limit pointing at the same address and thus\n-tries to clear memory from before the buffer begins.\n-\n-answer_request() is called with an invalid edns packet size provided by\n-the client. Ensure the udp_size provided by the client is bounded by\n-512 and configured maximum as per RFC 6891 6.2.3 \"Values lower than 512\n-MUST be treated as equal to 512\"\n-\n-The client that exposed the problem provided a payload udp size of 0.\n-\n-Signed-off-by: Kevin Darbyshire-Bryant \n----\n- src/forward.c | 2 ++\n- 1 file changed, 2 insertions(+)\n-\n-diff --git a/src/forward.c b/src/forward.c\n-index f22556a..62c5a5a 100644\n---- a/src/forward.c\n-+++ b/src/forward.c\n-@@ -1408,6 +1408,8 @@ void receive_query(struct listener *listen, time_t now)\n- \t defaults to 512 */\n- if (udp_size > daemon->edns_pktsz)\n- \tudp_size = daemon->edns_pktsz;\n-+ if (udp_size < 512)\n-+\tudp_size = 512; /* RFC 6891 6.2.3 */\n- }\n- \n- #ifdef HAVE_AUTH\n--- \n-2.7.4\n-\n","prefixes":["LEDE-DEV"]}