From nobody Tue May 7 10:25:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1590261377; cv=none; d=zohomail.com; s=zohoarc; b=ObQGZv5ULxR2BrVk7R1geJdLdRc0ohnkBfFGFBD+VMNKJ8LrFoE+TF/SHHX9YY2M+pvV13Mj+s/ILGCgWUvULyuw4QyfXDRGG4FAUGNPa3LUMlBOcQUUKmb9eFQ9cGQlx0Ucxa/tCuwLcojqJ9e21plkVDCocjJdmatnAmyy3No= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590261377; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AdMpyqTCFlk39vXTmF2j6XEmuS3qX56Iy8h4IChD2rE=; b=LFGMPQZSI28LrF73/NPMVmf7ghBhgXcLocuxLnSgYl4YV7pfau6Zsepl2GhrBvkuHJfpDg7ALf82CigkhDbz0wTpp5fUojJTZfnN7xDicRXXOhZZgZlJwGb01kEoW1V1A6K4JbT7pvhAmrbszDtN7vHRcOgFVuC7cq9Nb1cplFQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159026137763526.387634569998; Sat, 23 May 2020 12:16:17 -0700 (PDT) Received: from localhost ([::1]:43084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcZd2-00084W-Cs for importer@patchew.org; Sat, 23 May 2020 15:16:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcZcB-0006mK-JF for qemu-devel@nongnu.org; Sat, 23 May 2020 15:15:23 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:42023) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcZcA-0000aM-UD for qemu-devel@nongnu.org; Sat, 23 May 2020 15:15:23 -0400 Received: by mail-wr1-x441.google.com with SMTP id s8so13519020wrt.9 for ; Sat, 23 May 2020 12:15:22 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id y185sm13370681wmy.11.2020.05.23.12.15.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 12:15:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AdMpyqTCFlk39vXTmF2j6XEmuS3qX56Iy8h4IChD2rE=; b=gbKNzZ+YyBvYcTEK48o3NQh141E3nP6RlZfweMi3pVm5hn9ZUr5+dIQdp4OZBfikll 4agcifFJlMVtxMnIfLJE/6BdFwXWuSnyPWZRcDRPDb0Lg1sf9pCxrxdtxF12gZLNMxmb kCBnKaP72RJkB7tOhKVe7/kODlb3hEVT+qknve45oN5895fNQXORlCQ6UikE9Mai+tDN TuVC9CFE8uGSvXPwJk1tJA5o47dbRvktFoQDOCtYfrsf59b3+YRTbmR+2SpSMSVQgJkf wcvRM9LdWqxWRT20vYTd6PJ3gTa0LIgb33/qQZh5BNFQkRyVZ5lv25Cd3weZZEG8bR4W 22Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=AdMpyqTCFlk39vXTmF2j6XEmuS3qX56Iy8h4IChD2rE=; b=T/7co12lTsuINAiI5UrCi51t1guZjWUWOUz+uVwOetrUM+BKxHO9DOlI3fx1QJYu7e qy4+wPa+2F81ELdVqvbTTavEJlqM+Qr+Sxxr/n/4Vmpqph0kULudMvx3TQRV0gvv4M5J 0v/X5VO6hn4YbUmhFOS1euNJuu9RQ4MA0rpb0+rFlgkPY+tS0n7igN1VpnyPRq4qkr5s Vc1KrWueQ+EqRrBQR/62uuXJdE7tcsZi1vaI0gA2KGcGV9TEEtV5gk9KqV1E3PZ8jhr3 yponC+H6TFCnfcP1seWpA5LhLnXJBTF5G/r9YXG+zuTI5Cqd0nrN3UGbqSq42GOBszUN giMA== X-Gm-Message-State: AOAM531uJ6N672q/uaEV1tGdSc1EzKYigxt+FCjWkAAV8ySHCFhxnoOQ /C3SpKdIJG1l7R/TpA4BqJI= X-Google-Smtp-Source: ABdhPJyMpW3LrrN+PrjNd1oKVioCjlnbdpHrQ7cz4jbLOIvuB+BlupyCaf+QggOnwjyld/XjJFerxw== X-Received: by 2002:adf:f990:: with SMTP id f16mr2840152wrr.311.1590261321821; Sat, 23 May 2020 12:15:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Helge Deller , qemu-devel@nongnu.org, Richard Henderson , Sven Schnelle Subject: [PATCH 1/3] hw/display/artist: Check offset in draw_line to avoid buffer over-run Date: Sat, 23 May 2020 21:15:15 +0200 Message-Id: <20200523191517.23684-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200523191517.23684-1-f4bug@amsat.org> References: <20200523191517.23684-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: Alexander Bulekov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 &=3D ~plane_mask; (gdb) bt #0 0x000055d5dccdc5c0 in artist_rop8 (s=3D0x55d5defee510, dst=3D0x7f8e84= ed8216 , val=3D0 '\0= 00') at hw/display/artist.c:284 #1 0x000055d5dccdcf83 in fill_window (s=3D0x55d5defee510, startx=3D22, s= tarty=3D5674, width=3D65, height=3D5697) at hw/display/artist.c:551 #2 0x000055d5dccddfb9 in artist_reg_write (opaque=3D0x55d5defee510, addr= =3D1051140, val=3D4265537, size=3D4) at hw/display/artist.c:902 #3 0x000055d5dcb42a7c in memory_region_write_accessor (mr=3D0x55d5defeea= 10, addr=3D1051140, value=3D0x7ffe57db08c8, size=3D4, shift=3D0, mask=3D429= 4967295, attrs=3D...) at memory.c:483 Reported-by: LLVM libFuzzer Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/artist.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/display/artist.c b/hw/display/artist.c index 6261bfe65b..3c2550f6db 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -557,7 +557,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 =3D &s->vram_buffer[ARTIST_BUFFER_AP]; uint8_t color; int dx, dy, t, e, x, y, incy, diago, horiz; bool c1; @@ -565,6 +565,12 @@ static void draw_line(ARTISTState *s, int x1, int y1, = int x2, int y2, =20 trace_artist_draw_line(x1, y1, x2, y2); =20 + if (x1 * y1 >=3D buf->size || x2 * y2 >=3D 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 =3D (x2 << 16) | y2; } @@ -622,7 +628,6 @@ static void draw_line(ARTISTState *s, int x1, int y1, i= nt x2, int y2, x =3D x1; y =3D y1; color =3D artist_get_color(s); - buf =3D &s->vram_buffer[ARTIST_BUFFER_AP]; =20 do { if (c1) { --=20 2.21.3 From nobody Tue May 7 10:25:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1590261445; cv=none; d=zohomail.com; s=zohoarc; b=XeNPVzD1LjZzUrH1KlzAWKyDLDOlIplmNNTJjSphZNz/LfeQEnudVePlVfFDRXMrZEPjd8psVumi4o3lq7Awp1Z4kde7t8SVIdZ+2w3A94nS7nIjTPmhqLcAsReQBG9QylZiag34xSRx8nRnOO47WlH4s/pjoZ1U2HbWXdQqk6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590261445; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MuUd/xx1QteafhtU3bgpxtQqiUIGOCgMcYmDgBe3utQ=; b=N5dMiNvpYUF5f6H/wC7+Hp/68mRKllKydy0N1BhVF/5XOHqJQbaN1OFNbKcRJA+zIZG+Zxo8wPSV93H93Q32NbPBmpQDl8LhOAMxWdxScjadTVtcbHFebNRlW5RQziXkP+JXow205AxgLg8H8Jky14Hpq5JXBiAFpHYzuIKVQRk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590261445287515.2084940071903; Sat, 23 May 2020 12:17:25 -0700 (PDT) Received: from localhost ([::1]:48616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcZe7-00026k-Q8 for importer@patchew.org; Sat, 23 May 2020 15:17:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcZcC-0006nW-TM for qemu-devel@nongnu.org; Sat, 23 May 2020 15:15:24 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:35513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcZcC-0000aV-42 for qemu-devel@nongnu.org; Sat, 23 May 2020 15:15:24 -0400 Received: by mail-wr1-x441.google.com with SMTP id x14so8170275wrp.2 for ; Sat, 23 May 2020 12:15:23 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id y185sm13370681wmy.11.2020.05.23.12.15.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 12:15:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MuUd/xx1QteafhtU3bgpxtQqiUIGOCgMcYmDgBe3utQ=; b=WCMHRiA3oSImtgwSJmErKS/nRdIiBxoxP7waiHk4/8enyv/RTqhhg4QZXXhpwrJJWT I8KOGfk3GY+fjN+8mm2ikn2lqNAgGA3WXhRGADfyANUWK9NVKnS49yuJFIGuWk59phe6 +skDt9/dHkeLXssCOXu7OV1Qi0RFqNvbWBibJsteo+aRJVG/Cyv2vdxKK1oSBuA052oP 1wZJWvgd9HYTSEJGcU7X0E6oE2L6W0/J4Qwv13XEF3fMgfH+Vp1wb9LPGfNxPNqOo3c8 8kqD1ynPZ5GLn+7jR5vgdVEznw7dTC+P8RYmfqzfHOlEH7y2Gps5tJQiBGyGkupeLdIW YvQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=MuUd/xx1QteafhtU3bgpxtQqiUIGOCgMcYmDgBe3utQ=; b=ouZYVDvDcrbz6HE/2WxQIy9xUQ7hxOiJZ+uJJfNlBtTWhLiKT9wEEkSFScxiZqu5Nr 5n77CnT+C3ygWQ6tNWHGGZqXNbDld1+PtdqDZi0xp9o/3CRkfm5rO5WUs/U82W9lbc25 GBmDS7LZd7Re3I5pAzBF751Hd51RYbb8aZBsJee1alrh1KjFa8MtAOQ767rIhgEtjx8q NP2FR+ADYIwU9LEz6d+MKg7gDz1psjew74YzI99HQbeFVNxllepEls4AE6YhgXAgfXjq pRRI+gYpAnd9UPV/2WctMXquKWaS555aa/N0QNZYHzM7wFPp8izRfqrx61+3cdK7Wlhf 8PBg== X-Gm-Message-State: AOAM533ch5n6iI0g6dBX/6j4sE2m7a7Dka9wuHPWxj1y9T2uQOHidLbB YEi2mZU+FR2QFG4f0VmmiSA= X-Google-Smtp-Source: ABdhPJxsp0qrr0R9QwaYleVmXEpo7+FU2DsVA389XcX9RSH4Sy1ut00UtoplSAQmIBFYCgBnIzCblQ== X-Received: by 2002:a5d:608d:: with SMTP id w13mr8155313wrt.298.1590261322897; Sat, 23 May 2020 12:15:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Helge Deller , qemu-devel@nongnu.org, Richard Henderson , Sven Schnelle Subject: [PATCH 2/3] hw/display/artist: Refactor artist_rop8() to avoid buffer over-run Date: Sat, 23 May 2020 21:15:16 +0200 Message-Id: <20200523191517.23684-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200523191517.23684-1-f4bug@amsat.org> References: <20200523191517.23684-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: Alexander Bulekov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Invalid I/O writes can craft an offset out of the vram_buffer range. Instead of passing an unsafe pointer to artist_rop8(), pass the vram_buffer and the offset. We can now check if the offset is in range before accessing it. We avoid: Program terminated with signal SIGSEGV, Segmentation fault. 284 *dst &=3D ~plane_mask; (gdb) bt #0 0x000056367b2085c0 in artist_rop8 (s=3D0x56367d38b510, dst=3D0x7f9f97= 2fffff , val=3D0 '\0= 00') at hw/display/artist.c:284 #1 0x000056367b209325 in draw_line (s=3D0x56367d38b510, x1=3D-20480, y1= =3D-1, x2=3D0, y2=3D17920, update_start=3Dtrue, skip_pix=3D-1, max_pix=3D-1= ) at hw/display/artist.c:646 Reported-by: LLVM libFuzzer Buglink: https://bugs.launchpad.net/qemu/+bug/1880326 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/artist.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/hw/display/artist.c b/hw/display/artist.c index 3c2550f6db..6f61b85a24 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -273,11 +273,20 @@ static artist_rop_t artist_get_op(ARTISTState *s) return (s->image_bitmap_op >> 8) & 0xf; } =20 -static void artist_rop8(ARTISTState *s, uint8_t *dst, uint8_t val) +static void artist_rop8(ARTISTState *s, struct vram_buffer *buf, + int offset, uint8_t val) { - const artist_rop_t op =3D artist_get_op(s); - uint8_t plane_mask =3D s->plane_mask & 0xff; + uint8_t plane_mask; + uint8_t *dst; + + if (offset < 0 || offset >=3D buf->size) { + qemu_log_mask(LOG_GUEST_ERROR, + "rop8 offset:%d bufsize:%u\n", offset, buf->size); + return; + } + dst =3D buf->data + offset; + plane_mask =3D s->plane_mask & 0xff; =20 switch (op) { case ARTIST_ROP_CLEAR: @@ -381,7 +390,7 @@ static void vram_bit_write(ARTISTState *s, int posx, in= t posy, bool incr_x, } =20 for (i =3D 0; i < pix_count; i++) { - artist_rop8(s, p + offset + pix_count - 1 - i, + artist_rop8(s, buf, offset + pix_count - 1 - i, (data & 1) ? (s->plane_mask >> 24) : 0); data >>=3D 1; } @@ -398,7 +407,7 @@ static void vram_bit_write(ARTISTState *s, int posx, in= t posy, bool incr_x, for (i =3D 3; i >=3D 0; i--) { if (!(s->image_bitmap_op & 0x20000000) || s->vram_bitmask & (1 << (28 + i))) { - artist_rop8(s, p + offset + 3 - i, data8[ROP8OFF(i)]); + artist_rop8(s, buf, offset + 3 - i, data8[ROP8OFF(i)]); } } memory_region_set_dirty(&buf->mr, offset, 3); @@ -426,10 +435,10 @@ static void vram_bit_write(ARTISTState *s, int posx, = int posy, bool incr_x, if (!(s->image_bitmap_op & 0x20000000) || (vram_bitmask & mask)) { if (data & mask) { - artist_rop8(s, p + offset + i, s->fg_color); + artist_rop8(s, buf, offset + i, s->fg_color); } else { if (!(s->image_bitmap_op & 0x10000002)) { - artist_rop8(s, p + offset + i, s->bg_color); + artist_rop8(s, buf, offset + i, s->bg_color); } } } @@ -507,7 +516,7 @@ static void block_move(ARTISTState *s, int source_x, in= t source_y, int dest_x, if (dst + column > buf->size || src + column > buf->size) { continue; } - artist_rop8(s, buf->data + dst + column, buf->data[src + colum= n]); + artist_rop8(s, buf, dst + column, buf->data[src + column]); } } =20 @@ -548,7 +557,7 @@ static void fill_window(ARTISTState *s, int startx, int= starty, offset =3D y * s->width; =20 for (x =3D startx; x < startx + width; x++) { - artist_rop8(s, buf->data + offset + x, color); + artist_rop8(s, buf, offset + x, color); } } artist_invalidate_lines(buf, starty, height); @@ -561,7 +570,6 @@ static void draw_line(ARTISTState *s, int x1, int y1, i= nt x2, int y2, uint8_t color; int dx, dy, t, e, x, y, incy, diago, horiz; bool c1; - uint8_t *p; =20 trace_artist_draw_line(x1, y1, x2, y2); =20 @@ -630,16 +638,18 @@ static void draw_line(ARTISTState *s, int x1, int y1,= int x2, int y2, color =3D artist_get_color(s); =20 do { + int ofs; + if (c1) { - p =3D buf->data + x * s->width + y; + ofs =3D x * s->width + y; } else { - p =3D buf->data + y * s->width + x; + ofs =3D y * s->width + x; } =20 if (skip_pix > 0) { skip_pix--; } else { - artist_rop8(s, p, color); + artist_rop8(s, buf, ofs, color); } =20 if (e > 0) { @@ -773,10 +783,10 @@ static void font_write16(ARTISTState *s, uint16_t val) for (i =3D 0; i < 16; i++) { mask =3D 1 << (15 - i); if (val & mask) { - artist_rop8(s, buf->data + offset + i, color); + artist_rop8(s, buf, offset + i, color); } else { if (!(s->image_bitmap_op & 0x20000000)) { - artist_rop8(s, buf->data + offset + i, s->bg_color); + artist_rop8(s, buf, offset + i, s->bg_color); } } } --=20 2.21.3 From nobody Tue May 7 10:25:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1590261381; cv=none; d=zohomail.com; s=zohoarc; b=ApxamXD4TzB8KymzJVY2mOVkE7w8OdaqtSjwrKpU3BaQfRSYn3/S4NrZWlbNdR01HPxqsPkbKv+b2TX6KXmTPhn0R42K/qTPitK3QvzXW+aKv3QqhfNq17lXFlbSo6gJGyrNVNDLs4gMrWmEMDTCpx4f1hSGhGXAy7jWdX2SHAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590261381; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3/P/RORFvG7UdbIPFf45C1Qd+GHf2aIOo5B6nteH460=; b=UaOq11szlCIMWZgvuCk2VIVfhWg9T/XC8CnukcrpHPa4yH6vqyvo9v3EaqNsF/KvuOlg9nTFshP6gPdlcTA8tfIclnF86pQLHRJvPQmquAVYBtrLc6v3dip6E1aGmnQEpauw6deCGDc5KeIbDky4RU5O36p73SQZasa7vPN4fP4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590261381373564.29865104351; Sat, 23 May 2020 12:16:21 -0700 (PDT) Received: from localhost ([::1]:43442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcZd6-0008D6-1d for importer@patchew.org; Sat, 23 May 2020 15:16:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcZcE-0006pm-7O for qemu-devel@nongnu.org; Sat, 23 May 2020 15:15:26 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40069) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcZcD-0000ac-HV for qemu-devel@nongnu.org; Sat, 23 May 2020 15:15:25 -0400 Received: by mail-wr1-x441.google.com with SMTP id j16so1110264wrb.7 for ; Sat, 23 May 2020 12:15:25 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id y185sm13370681wmy.11.2020.05.23.12.15.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 12:15:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3/P/RORFvG7UdbIPFf45C1Qd+GHf2aIOo5B6nteH460=; b=SoXg+N7DAPMypoBC0pnAmDlZpaQrNZB1Ouxv8y/HYodRu9HyaAc6ersGG04ww27FxQ DeDMDtFy1eTZuNJ79VnoyymBFa0GpvI4TSdAC9HO6RIousuYwq8/ghc0TpcJMzzSYh4n Wb/+ErcX/3eIrEeRtgjgq0mtOyOCkY11ph8L/ZF/80eeRVmiVvof4xv29Ju+/p5iT8RO j+1Tbe0XhXuibH1eeKVM/qwnf32colP4DPSiA94j1+OjXqEg107jtS7bj1Yr+PakqGtg viJCWFcocxD4v0tKjHACTirNJflHwZ3Vr0cPmH9Wnm0dxbkEabjz0j2f91nSbda99UtI ifTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=3/P/RORFvG7UdbIPFf45C1Qd+GHf2aIOo5B6nteH460=; b=BA2uPTjLpswfq8hh49WfSE3HZBLKg3ZRzhEI/cqGQIQ/smXbBxUYzxYfe+Mr6p4bI0 vH8OhBzUYiq7HRn1y3bIPpIUF+LnTQfq/pnmKn6HeYJ4qEcP/YBvfj1OMespBnnwWvi7 /fYCyjmXWZjD8b75vMVP8NMa/3GrAsruIq5ATNkEJtdPZW26qNqtd5iVIKtGJLZaKZyO 0Nxjvqs9uJMX5Ks4lcYiuG4619vmsGFV0iMOhBt+FOA6HAbsd8Gc87x7a4HfiNx1tg+E 8WOr64yrOwqQIQ32/dFcImUx2BsCC5UhBTXzWUhdtlNELbgj5pahHvC8H49wh+pPXObh 1MvQ== X-Gm-Message-State: AOAM530Os9Zl94elBqd0hLly/6vT9QivU6MCcQBN1dPNvaUJidQk1Hak r5ZZIDQhvXMImksOHzmncDU= X-Google-Smtp-Source: ABdhPJx88ks8u8aGQCwmP/F6yHx0VR5LfBXmdnGI4ewYtoxCh8rWoqvDmaxGJS8wpt3T5uUjvyQHXQ== X-Received: by 2002:a5d:62c2:: with SMTP id o2mr8033540wrv.51.1590261324195; Sat, 23 May 2020 12:15:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Helge Deller , qemu-devel@nongnu.org, Richard Henderson , Sven Schnelle Subject: [PATCH 3/3] hw/display/artist: Check offset in block_move to avoid buffer over-read Date: Sat, 23 May 2020 21:15:17 +0200 Message-Id: <20200523191517.23684-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200523191517.23684-1-f4bug@amsat.org> References: <20200523191517.23684-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: Alexander Bulekov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Invalid I/O writes can craft an offset out of the vram_buffer range. We avoid: Program terminated with signal SIGSEGV, Segmentation fault. 519 artist_rop8(s, buf, dst + column, buf->data[src + col= umn]); (gdb) bt #0 0x000055fa83b05e0a in block_move (s=3D0x55fa8647e510, source_x=3D0, s= ource_y=3D0, dest_x=3D255, dest_y=3D-5, width=3D22, height=3D16705) at hw/d= isplay/artist.c:519 #1 0x000055fa83b071da in artist_reg_write (opaque=3D0x55fa8647e510, addr= =3D1051392, val=3D16777211, size=3D4) at hw/display/artist.c:954 Reported-by: LLVM libFuzzer Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/artist.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/display/artist.c b/hw/display/artist.c index 6f61b85a24..320e3c5050 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -513,6 +513,11 @@ static void block_move(ARTISTState *s, int source_x, i= nt source_y, int dest_x, dst =3D dest_x + ((line + dest_y) * buf->width); =20 for (column =3D startcolumn; column !=3D endcolumn; column +=3D co= lumnincr) { + if ((int)src + column < 0 || src + column >=3D buf->size) { + qemu_log_mask(LOG_GUEST_ERROR, + "block_move src:%d column:%d\n", src, column= ); + continue; /* FIXME */ + } if (dst + column > buf->size || src + column > buf->size) { continue; } --=20 2.21.3