From patchwork Mon Nov 2 17:09:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 320335 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp3901909ilc; Mon, 2 Nov 2020 09:21:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJzra7XeG+1wMgL5bUxCKxhQLHBk00impaQnbaG64hE6vOZvTW1Lv/WYBm+XJG0EjQP2kYL1 X-Received: by 2002:a37:5347:: with SMTP id h68mr16205509qkb.497.1604337704066; Mon, 02 Nov 2020 09:21:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604337704; cv=none; d=google.com; s=arc-20160816; b=DJGcQQEgSgZa8WCcMWlp+CrLof3hNeKslwNmD1lHmKHRVOqKWFXKBG+g/VepusDgst cIiYb/efxuXAQBPPi8ySnselUyezvU/RSXpdqir12nuL5J64sclCcEkGvJgdCZdRLPCL 8H+FrguaL+vdNCYHEMVZk5aUl/tqlgQu3VBLr0Mg/J+ZpsBEp4QActyhULOVXR86cN1G kx3WXZ/WMuG27og7ifxLmw1Nc8zaSPP7U5kUpzwV/g2nwWRSgzkKOSF2GNa3MwzoNci4 BUHPP2IGVMmh1NmHzvPw3wWLd3CKHz87lQBf96rxR/3Z4tEpYy5gmjaOW9C0j9ZqV2Zl Ji4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=PHlIRH7863n7trY1b/lRLkeSRiEQjbh9eyt3Xp710GY=; b=VSY/199wbvHIXDk1w/59X19E0D1955u4S77RJ+w9AUsUkTgAEB0R+M/Nya3wot+Hao EnLx2lEX34w/Q7ZiFnU8v+Cga2/fhJ/21WI3W7XbkEeL9CFEDQmJAVK1nHBPSvwcHoGD YbB/t27uHKYCY5ztlvwxAdr4uetP7R8rHJeleVrTHhTTQ3qGop8oQtZSV5fR13Vr9oHu fZUOGUtCzLhIKBlYa9STdjr3fJK8C5m40SmO304HDdKjg+ua/h33KweDR6KXP89oCIYd QGoaQBI+/wCon2oXdPFbMPhk6V4+EUfcrwXAq2vhO86CoWX4XMjOhK+RiFo5xYeCiIlo 9aeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=svWAz9bW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l36si8914286qte.214.2020.11.02.09.21.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Nov 2020 09:21:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=svWAz9bW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZdWZ-0006Zu-Gd for patch@linaro.org; Mon, 02 Nov 2020 12:21:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZdLv-00012q-Vh for qemu-devel@nongnu.org; Mon, 02 Nov 2020 12:10:44 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:37543) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kZdLt-0006c9-GK for qemu-devel@nongnu.org; Mon, 02 Nov 2020 12:10:43 -0500 Received: by mail-wm1-x342.google.com with SMTP id c16so10222648wmd.2 for ; Mon, 02 Nov 2020 09:10:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=PHlIRH7863n7trY1b/lRLkeSRiEQjbh9eyt3Xp710GY=; b=svWAz9bWchfwgECY344PtiYeWsCE/Hm77JXZ1Rc3jOwwqcnLTVJ8WYU8Hn5PqDcZJN X3KGf+/U9dy1++42xBMZ+Sf7K4exyyBLgMA4XtHkncH+i8hkPWDclLOFT2ynv7sVc892 Z27lpyQcenwAMkhpLIL51A3w4vUG5rlh/SjJkO6HgTZtha6TmLUyFZ8lJCJPxlgTZD4W gZm/msABK5JeHZhotAunFnHCCdDBHSGN9K7oGxkY8klBzaueGEI6oEUUjRouqx9HRfai JSih+eyBeEqe9KTOZ+jZQBIIotmvJU0IlhyjnpPezXOhmKclbYWIj9k8IBk2TgnRXIhL QRpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PHlIRH7863n7trY1b/lRLkeSRiEQjbh9eyt3Xp710GY=; b=YYLNE3a2diEiAKU6+z+8EbOAQem5Sfjbe0wJG1CieCn96/LslESaMoxUrhSinFKdnQ gkuTnJyd4FGK9TRVgwJ4iUu0Kq2wzvYb0Y4ESNwvIJINzfB4Bu/nfdR+K9utgya7DKrF cj3exqPpmScNA3fv/KKjA/cNKetwy7AvHz+QTfWd2+ZyBsW7AUW4CphGXXg13iHvjjsB qSK1KLAoBxXFYeV8s/ab0mUf1gEUNWkv6S6js9IehdtuqkRHJIukzoXcbNpXoXAByBeN ZDKodFuWuHzsOsbLUeRmsfizMBHGDMKzyCaChtgqLVyH8hn0emskP0k6ECRIPVnEbenZ kwRA== X-Gm-Message-State: AOAM530n+H9GFmgf03PgvlK4YghmLT8Lmx/7pmtCxtSwIcT280bVPz5j HR+nrHBUb6jzm+cjZ2HVH0UEBahrQH7aFQ== X-Received: by 2002:a1c:ac87:: with SMTP id v129mr18630069wme.119.1604337039975; Mon, 02 Nov 2020 09:10:39 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c18sm22396540wrt.10.2020.11.02.09.10.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 09:10:39 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 19/26] hw/display/omap_lcdc: Fix potential NULL pointer dereference Date: Mon, 2 Nov 2020 17:09:58 +0000 Message-Id: <20201102171005.30690-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201102171005.30690-1-peter.maydell@linaro.org> References: <20201102171005.30690-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x342.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: AlexChen In omap_lcd_interrupts(), the pointer omap_lcd is dereferinced 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 and move surface_bits_per_pixel(surface) to after the surface assignment. Reported-by: Euler Robot Signed-off-by: AlexChen Message-id: 5F9CDB8A.9000001@huawei.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/display/omap_lcdc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c index fa4a381db64..58e659c94ff 100644 --- a/hw/display/omap_lcdc.c +++ b/hw/display/omap_lcdc.c @@ -78,14 +78,18 @@ 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; hwaddr frame_base; - if (!omap_lcd || omap_lcd->plm == 1 || !omap_lcd->enable || - !surface_bits_per_pixel(surface)) { + if (!omap_lcd || omap_lcd->plm == 1 || !omap_lcd->enable) { + return; + } + + surface = qemu_console_surface(omap_lcd->con); + if (!surface_bits_per_pixel(surface)) { return; }