From patchwork Tue Aug 4 14:00:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 1340888 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=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=Y+fI5Rl8; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BLcT93SDbz9sTX for ; Wed, 5 Aug 2020 00:24:28 +1000 (AEST) Received: from localhost ([::1]:50386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2xre-0006R1-4l for incoming@patchwork.ozlabs.org; Tue, 04 Aug 2020 10:24:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2xVV-0000v3-Qd for qemu-devel@nongnu.org; Tue, 04 Aug 2020 10:01:33 -0400 Received: from mout.gmx.net ([212.227.15.19]:52565) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2xVT-0003Ao-MU for qemu-devel@nongnu.org; Tue, 04 Aug 2020 10:01:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1596549660; bh=yi/ZvGbDbrIWKgg46+4OlOrFcTrRqKN6hBd0HkJl3lk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Y+fI5Rl87pyQCVEWX2znhKFXA2Czc1AwdTpS4EOoI6TDyUJdTvlioC+h+lseVxXrM H4kUrCMuJGYKJ5L/9foPgJkai4ee4cMMMtXS8dDPcd2EE/TP9vZTVJcR4OS6eOwBNx 8Q3mjy4noyvx0ExpbilG5LWJFqICAIIH9IbgRy10= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from ls3530.fritz.box ([92.116.144.148]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M5QF5-1k3myk3Xlt-001NXs; Tue, 04 Aug 2020 16:00:59 +0200 From: Helge Deller To: peter.maydell@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 6/8] hw/display/artist: Check offset in draw_line to avoid buffer over-run Date: Tue, 4 Aug 2020 16:00:54 +0200 Message-Id: <20200804140056.7690-7-deller@gmx.de> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200804140056.7690-1-deller@gmx.de> References: <20200804140056.7690-1-deller@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:3RUhxfg8BVSAOOK7oGVqe8lfZ5ETiQvbvhUzD60aTvUziIpFNXk /dcpHuBqQhg8TC7i4bgJ1gTkHFWzWK/WdDH4DSRgw8MRb20to3J+CYdwXT5u+waiVb5UcR8 akHhwg9AYFQyKfZ/D9f1YU+NBH+tAsKTgfCo0iu7cT7d7OPJOSouaSI3u63rE+ZPOoGbf90 hx3yCOpFEZ2Kp3zsy06gg== X-UI-Out-Filterresults: notjunk:1;V03:K0:SMXB6POInEM=:v9NJrjwUvyj2r5uqNGyYvE rIkRuuZ6A198aOO74Dv6UnGLtaiWmOVdkty7WmPYMVOzEVelHO2gdo/y3biO+KXMe+lEvnWRj OxehxdqnCCjrLT5aW9dnCdk1y12r4mU4re82DEgHVzXKNGy57N3YUz+mp1twj7bGTj0QhnlOC xKKuQuO+XZZ3w7fpXZtWEOAAdp8FqwfskoeaXE+G1nWELCxo3BETy09mOR+CQ3qwtgDQqhgVM yI6JG7QFjDbDTmmnQxfpBe80Ivwwueuqj8zkIBfmEqnsmWZHvsu4o8c54NAp9UwX+WW6CZzAk EEmie2kzF1/+ObEkrhzWzYHFyDhI2SiWZiOJg8luncwF6E+WPEqv6cGKgrozUeTWonxqKNilh mPa1v/uIPi6uSAk73zQOP5+gIPzP92oH5Yf5OdxvBkkvz2yebGVr7k8+SigllvndgG/N4jzx9 6qGKeG4g0zT8KcUJOO/wwWyjTmVsDu2cef91tbbKcS3Q70XWjSMXjs+ODOAczfyzHtGkpf5oe ziIL8IV8GOWSbYiozqtRTi/jw48n/1oQOXYW/7l9uRZ1ptFcycKTX7+w4832MZvK56GNk0wlS 2PzVjBg3qi2flkcg86nN6OWfOOVDTvxWyQNpzUNEo/QP0RIG8DEqu5YgGEY9XrRw4lnLwV9P5 7V2SARb1VD+wF6bO1tw3htA93nfbkMNH53LRn6c2HAInTMHwTXXBQks1MC88B/jjXas2bz2gq sZ6Ftm3q9W/NyjGlU87QsblFNWIS+6Q6TmYmEa6WK9XYJxqZAi3DwztDeBTS7gCmkXNqtGtnO jnu02IN+9NBlR7nLBytlkCwrQ4xiLRDmZTotW+I6KotFFKQR3dqE0Yjus0fhVr0ziXNHKNcSF TEX9+40wmFGsnZAUMsYwfk1Hm00X8Lu5hl/6EA0TL9WKIHb2S+HIrJlxw9ImdEhbRuWrCpyR6 +lKYoVl/HNp61AAJJM3guz8lrAgR321/C5KyXZNHbMWPTY/opbWpkBI6tYVa1qfT8eBeVIvXL gFPQua1HM8DbtYBUyglqY5UHuaqG4iCj3HgYPcHyV3YXgfsRDluQnhaS7cKW1FtNgfGBVwbZc g5FRXfRa409Lw026dXCATAQlDu2zbL7GSJ62TKZwCP+bZsiZiAeuLQQ093fkHtNZPwLfFcGTK KBqJTn0Q2ItOlcFSkPHBnIhk95dEPsM4YAk8aHeg5sChim23n6uSIs9d8Ygm/1tt8/rTK7n6b 47Z3KquaA0mjiRmM8 Received-SPF: pass client-ip=212.227.15.19; envelope-from=deller@gmx.de; helo=mout.gmx.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/04 10:01:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Helge Deller , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Invalid I/O writes can craft an offset out of the vram_buffer range. We avoid: Program terminated with signal SIGSEGV, Segmentation fault. 284 *dst &= ~plane_mask; (gdb) bt #0 0x000055d5dccdc5c0 in artist_rop8 (s=0x55d5defee510, dst=0x7f8e84ed8216 , val=0 '\000') at hw/display/artist.c:284 #1 0x000055d5dccdcf83 in fill_window (s=0x55d5defee510, startx=22, starty=5674, width=65, height=5697) at hw/display/artist.c:551 #2 0x000055d5dccddfb9 in artist_reg_write (opaque=0x55d5defee510, addr=1051140, val=4265537, size=4) at hw/display/artist.c:902 #3 0x000055d5dcb42a7c in memory_region_write_accessor (mr=0x55d5defeea10, addr=1051140, value=0x7ffe57db08c8, size=4, shift=0, mask=4294967295, attrs=...) at memory.c:483 Reported-by: LLVM libFuzzer Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Helge Deller --- hw/display/artist.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.21.3 diff --git a/hw/display/artist.c b/hw/display/artist.c index de56200dbf..a206afe641 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -555,7 +555,7 @@ static void fill_window(ARTISTState *s, int startx, int starty, static void draw_line(ARTISTState *s, int x1, int y1, int x2, int y2, bool update_start, int skip_pix, int max_pix) { - struct vram_buffer *buf; + struct vram_buffer *buf = &s->vram_buffer[ARTIST_BUFFER_AP]; uint8_t color; int dx, dy, t, e, x, y, incy, diago, horiz; bool c1; @@ -563,6 +563,12 @@ static void draw_line(ARTISTState *s, int x1, int y1, int x2, int y2, trace_artist_draw_line(x1, y1, x2, y2); + if (x1 * y1 >= buf->size || x2 * y2 >= buf->size) { + qemu_log_mask(LOG_GUEST_ERROR, + "draw_line (%d,%d) (%d,%d)\n", x1, y1, x2, y2); + return; + } + if (update_start) { s->vram_start = (x2 << 16) | y2; } @@ -620,7 +626,6 @@ static void draw_line(ARTISTState *s, int x1, int y1, int x2, int y2, x = x1; y = y1; color = artist_get_color(s); - buf = &s->vram_buffer[ARTIST_BUFFER_AP]; do { if (c1) {