From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kYRZ8-0004eB-Qu for mharc-qemu-trivial@gnu.org; Fri, 30 Oct 2020 06:23:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYRZ7-0004ck-Ji; Fri, 30 Oct 2020 06:23:25 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:2490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYRZ5-0008Ij-QN; Fri, 30 Oct 2020 06:23:25 -0400 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CMz0p4ByJzhd3m; Fri, 30 Oct 2020 18:23:22 +0800 (CST) Received: from [10.174.187.138] (10.174.187.138) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Fri, 30 Oct 2020 18:23:15 +0800 Message-ID: <5F9BE993.4050406@huawei.com> Date: Fri, 30 Oct 2020 18:23:15 +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/omap_lcdc: 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:23:26 -0000 In omap_lcd_interrupts(), the pointer omap_lcd is dereferenced before being check if it is valid, which may lead to NULL pointer dereference. So move the assignment to surface after checking that the omap_lcd is valid. Reported-by: Euler Robot Signed-off-by: Alex Chen --- hw/display/omap_lcdc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c index fa4a381db6..2941c5c67c 100644 --- a/hw/display/omap_lcdc.c +++ b/hw/display/omap_lcdc.c @@ -78,7 +78,7 @@ static void omap_lcd_interrupts(struct omap_lcd_panel_s *s) static void omap_update_display(void *opaque) { struct omap_lcd_panel_s *omap_lcd = (struct omap_lcd_panel_s *) opaque; - DisplaySurface *surface = qemu_console_surface(omap_lcd->con); + DisplaySurface *surface; draw_line_func draw_line; int size, height, first, last; int width, linesize, step, bpp, frame_offset; @@ -89,6 +89,7 @@ static void omap_update_display(void *opaque) return; } + surface = qemu_console_surface(omap_lcd->con); frame_offset = 0; if (omap_lcd->plm != 2) { cpu_physical_memory_read( -- 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 d23csp1386685lfa; Fri, 30 Oct 2020 03:26:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXqOPhLHC6bOnXGlIDQ/0gEtfUmJPVnBY/o4ZoErQRPNGF+rIxRVAXAILqZfxWeZLXDgFY X-Received: by 2002:a25:c6d0:: with SMTP id k199mr2514984ybf.469.1604053587417; Fri, 30 Oct 2020 03:26:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1604053587; cv=none; d=google.com; s=arc-20160816; b=pvoKCJprL6uvAzPGG1sAL26mIye7HnEbmzsfYnEYMxUVMDD5RjukMvi4uReDOxWuDP 1flBinqffN3sYZQOKT+2tiNim44oR0SZfbfzZ6rG1bH7u705eCXBjOGdFdm3SFxm09XL jKMD0eCgEyCzRtdJDy1CZ4vnpO5HztmAVbx5YnZTaMlK+1m097yd6IfaHM3zz5GzhnUc Ct/QTQaGIyPfo900xZLuDpjmgwvh3Irfg26WVDlW5+SNNEWv1VNbaAOWE84NlXvTuAB3 sFEHXd41u7Fqh6eciUQlgop3RZntPHcOHQzgq5GjvcCI9PmQzKSAfGrOarh2Cj+xQkub 3f8w== 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=7N8ONtTGRqPasbdDGyiUuQaX3v2H7HZ+BYp3xu5pvgA=; b=jfouEhCWwutwQuMiczroA0iPmVG/mdBstfLizfl+YYMdcxPIxTSzlR4sFMLXDJYhXE GI+mUO72Qg4lB+w9Zw4w2VWTpM7UatBFiz8rb1dPwzJVXbPLP54yIfPcL+A8N4IlQNyp d/AFANn5J1JXrbw4613hcAhx0tFUak2gojbrLGivnNMotsKkAkf52mChlHRTiRXqkLOS HI+WGqyqkqBOIWfbpP2m32CkvY8iGEg5DMb5SOlQSVRDO4oNHyPtG04lCOdaG3zppzY+ 5+Ps+TV1auqSowF5/DTVW1SHalY3P4FfHxabzM0DoAgne1GlCJmh7NM7QJX/YV1MlneA 7lNw== 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 v198si6514079ybv.367.2020.10.30.03.26.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Oct 2020 03:26:27 -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]:38332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kYRc2-0006tc-Ko for alex.bennee@linaro.org; Fri, 30 Oct 2020 06:26:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYRZ7-0004ck-Ji; Fri, 30 Oct 2020 06:23:25 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:2490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYRZ5-0008Ij-QN; Fri, 30 Oct 2020 06:23:25 -0400 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CMz0p4ByJzhd3m; Fri, 30 Oct 2020 18:23:22 +0800 (CST) Received: from [10.174.187.138] (10.174.187.138) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Fri, 30 Oct 2020 18:23:15 +0800 Message-ID: <5F9BE993.4050406@huawei.com> Date: Fri, 30 Oct 2020 18:23:15 +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/omap_lcdc: 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: +I/RUm+z24Oj In omap_lcd_interrupts(), the pointer omap_lcd is dereferenced before being check if it is valid, which may lead to NULL pointer dereference. So move the assignment to surface after checking that the omap_lcd is valid. Reported-by: Euler Robot Signed-off-by: Alex Chen --- hw/display/omap_lcdc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c index fa4a381db6..2941c5c67c 100644 --- a/hw/display/omap_lcdc.c +++ b/hw/display/omap_lcdc.c @@ -78,7 +78,7 @@ static void omap_lcd_interrupts(struct omap_lcd_panel_s *s) static void omap_update_display(void *opaque) { struct omap_lcd_panel_s *omap_lcd = (struct omap_lcd_panel_s *) opaque; - DisplaySurface *surface = qemu_console_surface(omap_lcd->con); + DisplaySurface *surface; draw_line_func draw_line; int size, height, first, last; int width, linesize, step, bpp, frame_offset; @@ -89,6 +89,7 @@ static void omap_update_display(void *opaque) return; } + surface = qemu_console_surface(omap_lcd->con); frame_offset = 0; if (omap_lcd->plm != 2) { cpu_physical_memory_read( -- 2.19.1