From patchwork Tue Oct 13 13:36:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Petr_=C5=A0tetiar?= X-Patchwork-Id: 1381590 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=true.cz Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=edOZXmh5; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C9c7l20Dmz9sTv for ; Wed, 14 Oct 2020 00:38:27 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=630sR3b3JJmUlyeX4USrcQepanp7bI3jUWSplDeV0EU=; b=edOZXmh55zpNCQlHgmGseuMyc KDHigkWaDq0X7vNucpIXk1qlqFD6CtryFY44WvvNBOQvSqzSL2IICZgp+MzCLMBzG2ulTHmvMg4uY NGGc3RJyJLYMxq2CYM9PQRoC4zw1AKfgT1Fzn+Ep3D4nV6lRlmzDaA/Lldt87HgdDySVD9nnjOCDi 3gaJXSLJy9Fokb5FURNKnFO8waGz7DMrz6GYVVVeIpZncLy2qMfZ5zaMa1pW4JyFkHC4vMVYxYzxE yBmBBVLKJ8AKEvxcahNgn8UZurXtt7eHZqfDQ4Z3Q8r7Pw0MF7SS6+ph5m9J/dLtHAtaFeAdE4QQ7 vn4Ojl6Ig==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSKUA-0006Jd-Ik; Tue, 13 Oct 2020 13:37:02 +0000 Received: from smtp-out.xnet.cz ([178.217.244.18]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSKTk-0006Ax-4R for openwrt-devel@lists.openwrt.org; Tue, 13 Oct 2020 13:36:38 +0000 Received: from meh.true.cz (meh.true.cz [108.61.167.218]) (Authenticated sender: petr@true.cz) by smtp-out.xnet.cz (Postfix) with ESMTPSA id 322D81870F; Tue, 13 Oct 2020 15:36:28 +0200 (CEST) Received: by meh.true.cz (OpenSMTPD) with ESMTP id 4c7e929f; Tue, 13 Oct 2020 15:36:11 +0200 (CEST) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Subject: [PATCH mdnsd 09/10] cache: cache_record_find: fix buffer overflow Date: Tue, 13 Oct 2020 15:36:20 +0200 Message-Id: <20201013133621.27088-10-ynezz@true.cz> In-Reply-To: <20201013133621.27088-1-ynezz@true.cz> References: <20201013133621.27088-1-ynezz@true.cz> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201013_093636_349097_45519512 X-CRM114-Status: GOOD ( 20.03 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Petr_=C5=A0tetiar?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Fixes following buffer overflow: ERROR: AddressSanitizer: global-buffer-overflow on address 0x0000007338b8 at pc 0x0000004db339 bp 0x7ffe370e6140 sp 0x7ffe370e6138 READ of size 8 at 0x0000007338b8 thread T0 #0 0x4db338 in cache_record_find mdnsd/cache.c:197:17 #1 0x4d74b4 in cache_answer mdnsd/cache.c:336:6 #2 0x4cf04a in parse_answer mdnsd/dns.c:343:3 #3 0x4cb272 in dns_handle_packet mdnsd/dns.c:442:7 #4 0x4f508c in read_socket4 mdnsd/interface.c:253:3 #5 0x7fb81dddc73d in uloop_run_events libubox/uloop.c:198:4 #6 0x7fb81dddc73d in uloop_run_timeout libubox/uloop.c:555:3 #7 0x4c77cd in uloop_run libubox/uloop.h:111:9 #8 0x4c7757 in main mdnsd/main.c:99:2 0x0000007338b8 is located 8 bytes to the right of global variable 'records' defined in 'mdnsd/cache.c:45:1' (0x733880) of size 48 SUMMARY: AddressSanitizer: global-buffer-overflow mdnsd/cache.c:197:17 in cache_record_find Signed-off-by: Petr Štetiar --- cache.c | 2 +- .../crash-68e33cae6500804f6856f5a92dca26626ad0479c | Bin 0 -> 69 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 tests/fuzz/corpus/crash-68e33cae6500804f6856f5a92dca26626ad0479c GIT binary patch literal 69 ycmZo*_}jq1z_4xU{~ruY@j#|P1LHPPAV*t4RRBqt2P(`UAO-^<5uk<#e0%^rNfjgj literal 0 HcmV?d00001 diff --git a/cache.c b/cache.c index 7d2aa8fdba2d..b2e5568f517a 100644 --- a/cache.c +++ b/cache.c @@ -194,7 +194,7 @@ cache_record_find(char *record, int type, int port, int rdlength, uint8_t *rdata if (!l) return NULL; - while (l && l->record && !strcmp(l->record, record)) { + while (l && !avl_is_last(&records, &l->avl) && !strcmp(l->record, record)) { struct cache_record *r = l; l = avl_next_element(l, avl); diff --git a/tests/fuzz/corpus/crash-68e33cae6500804f6856f5a92dca26626ad0479c b/tests/fuzz/corpus/crash-68e33cae6500804f6856f5a92dca26626ad0479c new file mode 100644 index 0000000000000000000000000000000000000000..69cd85b203101a80e6f3417ceedbbc0c2e4ff893