Received: by 2002:a19:f614:0:0:0:0:0 with SMTP id x20csp60352lfe; Fri, 15 Apr 2022 19:30:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxj7dVEEKvLnxDgqhrHsgnwIRP68KTBpXmaMZsyhWA6yBWtHNiKCMSf+KjKVLmU4LOWSvI7 X-Received: by 2002:a05:6a00:1591:b0:4fa:ef3e:6005 with SMTP id u17-20020a056a00159100b004faef3e6005mr1858460pfk.27.1650076215841; Fri, 15 Apr 2022 19:30:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650076215; cv=none; d=google.com; s=arc-20160816; b=mUj9HivZSe3exlexaz9Wvja1LC7qV87c1xr1j8J17CirtXqExfsT1Lni/K9Ny9IM5t SAvrdk0q4hgBU0xn6uOXckIrkBjejx1qjVoDN5Q5k/jy4fNDXIbC8k1G1YLCasD2J7wp GHbChoILC1HRLnJEuswXg4KceRsDbU1kpSwHDGkb60nIyNy+H6rR7SDGrN5+O2ywQmG0 tNsUi7uLciTSVeCto3JvpbOLrYyeVWbFUknJ5K+9CU0cuJwYTcyLJIjqPbEcMNGouHM1 RrUkzzHyx4h8KHHuvyAcMGKKMif/LqbVDZMe8lXv7ASmc7AhnsrOGrFw96xBLHDcDRXJ P4IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=iRTpUhQUVPIt9hfdfM17flm7l/tZ1x96PMFHQVOl8KY=; b=fM4b/YqiRC5qJ4zr0t4SzFkM1QyrmYJhzkK94pjx0eZ/SeAKiSmubsh6LZmF/6WW5N i7cg+1aVyGF457uI1ghnaOje1ThE1WgGKWboLmQg3V+Jp6q01sN/fjqRrG0Zv0g8TK4C buEGPemcEnuq/ffk02apEVFaoeFuRTsOVaKRI3n7F+34BefORFYRPZaAMgI+ukQaM6pO yAACEJhbnfG9l0rpSsmpv12vEDNseZQdZjPviJgBKTw5EysQ7vvHTBYrhyVIcOOB4pLj bzD0XcOZe6/Z/wqRycvEXKabzZNvIa7y+KCl0TqH23JceDkgKMeQDxwqiZYEIfDUGMBp KvpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=vHnKDAOo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id m6-20020a17090a920600b001d25b8d283bsi62323pjo.59.2022.04.15.19.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Apr 2022 19:30:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=vHnKDAOo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 626D2167F95; Fri, 15 Apr 2022 18:44:36 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240945AbiDNIe6 (ORCPT + 99 others); Thu, 14 Apr 2022 04:34:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237689AbiDNIe5 (ORCPT ); Thu, 14 Apr 2022 04:34:57 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B00363391; Thu, 14 Apr 2022 01:32:33 -0700 (PDT) Received: from [192.168.1.111] (91-156-85-209.elisa-laajakaista.fi [91.156.85.209]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 99A1125B; Thu, 14 Apr 2022 10:32:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1649925151; bh=f95sAmWwdjHUVI8Avcc4pPnkl/AY78Md6cw7xBbSuOw=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=vHnKDAOozWKdm9KwKMINztx80dsZqkPD9YUHKngyWssNiBI1T7OkTyynBzZIozuIT l4Dn2O+eAWi5OB2z6Bd+IZcRoMfcU8Ab0DQsirXjNwgvIp8JlCGz5a60gr+3jCNSLe Fr+VPChZjLnp7FfaxMIiJIyxyvUlmW+d3DM5vJKg= Message-ID: Date: Thu, 14 Apr 2022 11:32:27 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [RESEND][PATCH] omapdrm: fix missing check on list iterator Content-Language: en-US To: Xiaomeng Tong , airlied@linux.ie, daniel@ffwll.ch Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org References: <20220414061410.7678-1-xiam0nd.tong@gmail.com> From: Tomi Valkeinen In-Reply-To: <20220414061410.7678-1-xiam0nd.tong@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-5.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,RDNS_NONE,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 14/04/2022 09:14, Xiaomeng Tong wrote: > The bug is here: > bus_flags = connector->display_info.bus_flags; > > The list iterator 'connector-' will point to a bogus position containing > HEAD if the list is empty or no element is found. This case must > be checked before any use of the iterator, otherwise it will lead > to a invalid memory access. > > To fix this bug, add an check. Use a new value 'iter' as the list > iterator, while use the old value 'connector' as a dedicated variable > to point to the found element. > > Cc: stable@vger.kernel.org > Fixes: ("drm/omap: Add support for drm_panel") > Signed-off-by: Xiaomeng Tong > --- > drivers/gpu/drm/omapdrm/omap_encoder.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c > index 4dd05bc732da..d648ab4223b1 100644 > --- a/drivers/gpu/drm/omapdrm/omap_encoder.c > +++ b/drivers/gpu/drm/omapdrm/omap_encoder.c > @@ -76,14 +76,16 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder, > struct omap_encoder *omap_encoder = to_omap_encoder(encoder); > struct omap_dss_device *output = omap_encoder->output; > struct drm_device *dev = encoder->dev; > - struct drm_connector *connector; > + struct drm_connector *connector = NULL, *iter; > struct drm_bridge *bridge; > struct videomode vm = { 0 }; > u32 bus_flags; > > - list_for_each_entry(connector, &dev->mode_config.connector_list, head) { > - if (connector->encoder == encoder) > + list_for_each_entry(iter, &dev->mode_config.connector_list, head) { > + if (iter->encoder == encoder) { > + connector = iter; > break; > + } > } When does this bug happen? How do you get omap_encoder_mode_set() called for an encoder with a connector that is not valid? > > drm_display_mode_to_videomode(adjusted_mode, &vm); > @@ -106,8 +108,10 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder, > omap_encoder_update_videomode_flags(&vm, bus_flags); > } > > - bus_flags = connector->display_info.bus_flags; > - omap_encoder_update_videomode_flags(&vm, bus_flags); > + if (connector) { > + bus_flags = connector->display_info.bus_flags; > + omap_encoder_update_videomode_flags(&vm, bus_flags); > + } > > /* Set timings for all devices in the display pipeline. */ > dss_mgr_set_timings(output, &vm); How does this fix the issue? You just skip the lines that set up the videomode, but then pass that videomode to dss_mgr_set_timings()... Tomi