From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kYRYj-00045G-1f for mharc-qemu-trivial@gnu.org; Fri, 30 Oct 2020 06:23:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYRYh-00044g-9N; Fri, 30 Oct 2020 06:22:59 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:2426) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYRYe-00082C-U1; Fri, 30 Oct 2020 06:22:58 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CMz096vdNzLrL1; Fri, 30 Oct 2020 18:22:49 +0800 (CST) Received: from [10.174.187.138] (10.174.187.138) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Fri, 30 Oct 2020 18:22:45 +0800 Message-ID: <5F9BE974.3040806@huawei.com> Date: Fri, 30 Oct 2020 18:22:44 +0800 From: AlexChen User-Agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: , CC: , QEMU , Subject: [PATCH] hw/display/exynos4210_fimd: Fix potential NULL pointer dereference Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.187.138] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.191; envelope-from=alex.chen@huawei.com; helo=szxga05-in.huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/30 06:22:50 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Oct 2020 10:22:59 -0000 In exynos4210_fimd_update(), the pointer s is dereferenced before being check if it is valid, which may lead to NULL pointer dereference. So move the assignment to global_width after checking that the s is valid Reported-by: Euler Robot Signed-off-by: Alex Chen --- hw/display/exynos4210_fimd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index 4c16e1f5a0..a1179d2f89 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -1275,12 +1275,12 @@ static void exynos4210_fimd_update(void *opaque) bool blend = false; uint8_t *host_fb_addr; bool is_dirty = false; - const int global_width = (s->vidtcon[2] & FIMD_VIDTCON2_SIZE_MASK) + 1; if (!s || !s->console || !s->enabled || surface_bits_per_pixel(qemu_console_surface(s->console)) == 0) { return; } + const int global_width = (s->vidtcon[2] & FIMD_VIDTCON2_SIZE_MASK) + 1; exynos4210_update_resolution(s); surface = qemu_console_surface(s->console); -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:6b17:0:0:0:0:0 with SMTP id d23csp1384715lfa; Fri, 30 Oct 2020 03:23:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7z3yNyZxzkpNtUV4XJwFdqL8+fUIgGM2bcdJRlNlBRJUlx6VD6f/8PlR5UelAOSL4KdcW X-Received: by 2002:a25:cc8e:: with SMTP id l136mr2453528ybf.10.1604053424448; Fri, 30 Oct 2020 03:23:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1604053424; cv=none; d=google.com; s=arc-20160816; b=HlbiPO0fbhJcrc2NvMguZWnlZc0r8Cgw1hJKa/gwSEK5NSaU5v1IOImuC+fAuLJHqt cJTltmqEHx6smK0Yefh7MZpGp/SucAkOYVD+5wdugjHpe2HWVdNLeXSxNL5VgjastI2p ZYC8zIRV5vHr/IYuW+9cM7Akf28cN6Pog5HqTH1l8HGXJp8W89n0DBzrzHf6sWd1jSAH ur3xGCi4SvkE6ahcf4n398GLThcWzbE6nillTkXVy84b8KI9Yz8b5e1Xju1z6ffuNguE CDkOsUP3o0f/UKg79zRfD0c0SSY607Do633I771Dw8evyNIX8alhafqCgplcPY7A1fr9 0kNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :subject:to:mime-version:user-agent:from:date:message-id; bh=tXOhGMLp11T4FBoAuXMD9efkChm01OXJA/64ag3kQRQ=; b=CoC11TcYK8OudYxT1/V0gE0ez/sEnmC37emdM91w6yhZV41UD8sTjJOP4mwS9SiGT1 dMh49Tp4f+qUysi2c0I4R7EEFNPFEOQr17tzm8OCEz0dzTISCPImRmmKlyEBcdmzVTNd /WaiUtlkcWbayvuxym/AS2NMAAjEUKbVNb39WINTfYRq9XFTTPiS4B8u0M0Nchye0lm/ ZpZSni5HfbZgORB9WfRzYRpsBWNJmkznNuH2gEz4IFBgug5Bm3TEr6bDMZiENVdSaPJ/ j4I4Atx/WkUqSSIR2CZS4k+jo7ftZeZT9DhbhaNqeJoirKgrsSW2GjnSmoYq7hwKXNJR 9vJw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r3si5990344ybk.191.2020.10.30.03.23.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Oct 2020 03:23:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org" Received: from localhost ([::1]:33560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kYRZP-0004eM-R3 for alex.bennee@linaro.org; Fri, 30 Oct 2020 06:23:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYRYh-00044g-9N; Fri, 30 Oct 2020 06:22:59 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:2426) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYRYe-00082C-U1; Fri, 30 Oct 2020 06:22:58 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CMz096vdNzLrL1; Fri, 30 Oct 2020 18:22:49 +0800 (CST) Received: from [10.174.187.138] (10.174.187.138) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Fri, 30 Oct 2020 18:22:45 +0800 Message-ID: <5F9BE974.3040806@huawei.com> Date: Fri, 30 Oct 2020 18:22:44 +0800 From: AlexChen User-Agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: , Subject: [PATCH] hw/display/exynos4210_fimd: Fix potential NULL pointer dereference Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.187.138] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.191; envelope-from=alex.chen@huawei.com; helo=szxga05-in.huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/30 06:22:50 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, 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: qemu-trivial@nongnu.org, qemu-arm@nongnu.org, QEMU Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: 2QcpHt8PIT2D In exynos4210_fimd_update(), the pointer s is dereferenced before being check if it is valid, which may lead to NULL pointer dereference. So move the assignment to global_width after checking that the s is valid Reported-by: Euler Robot Signed-off-by: Alex Chen --- hw/display/exynos4210_fimd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index 4c16e1f5a0..a1179d2f89 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -1275,12 +1275,12 @@ static void exynos4210_fimd_update(void *opaque) bool blend = false; uint8_t *host_fb_addr; bool is_dirty = false; - const int global_width = (s->vidtcon[2] & FIMD_VIDTCON2_SIZE_MASK) + 1; if (!s || !s->console || !s->enabled || surface_bits_per_pixel(qemu_console_surface(s->console)) == 0) { return; } + const int global_width = (s->vidtcon[2] & FIMD_VIDTCON2_SIZE_MASK) + 1; exynos4210_update_resolution(s); surface = qemu_console_surface(s->console); -- 2.19.1