Message ID | 20230630110643.209761-10-hdegoede@redhat.com (mailing list archive) |
---|---|
State | Superseded |
Headers |
Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from <linux-media-owner@vger.kernel.org>) id 1qFBzK-00ADVQ-Eh; Fri, 30 Jun 2023 11:08:30 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230013AbjF3LI0 (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Fri, 30 Jun 2023 07:08:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232301AbjF3LIN (ORCPT <rfc822;linux-media@vger.kernel.org>); Fri, 30 Jun 2023 07:08:13 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C46C53AAB for <linux-media@vger.kernel.org>; Fri, 30 Jun 2023 04:07:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688123244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qkAExNhpijKNG0m31GTF805aVMxzHAvMEggGBzh7744=; b=GCtWPlJHdB2ubK6bAHVIAQSOep8tiC6qoJEiwwVC5GeKl8Rq8/oBt73kUsCswf+1V8jF6o dCuzP8+L817UJC/dkJDgC2gZLMh8QVit7rtSnRIJB+J+kxGA+yXHZYDtTJbwzZzpdk6WmO COmg2TBnznCUaDlW3BHS0U94WRc32tE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-38-isRRxZoXNOWsyxX-1-HdQA-1; Fri, 30 Jun 2023 07:07:20 -0400 X-MC-Unique: isRRxZoXNOWsyxX-1-HdQA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EEEB818E6C44; Fri, 30 Jun 2023 11:07:18 +0000 (UTC) Received: from shalem.redhat.com (unknown [10.39.193.184]) by smtp.corp.redhat.com (Postfix) with ESMTP id 867A2492B02; Fri, 30 Jun 2023 11:07:17 +0000 (UTC) From: Hans de Goede <hdegoede@redhat.com> To: Sakari Ailus <sakari.ailus@linux.intel.com>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Daniel Scally <dan.scally@ideasonboard.com> Cc: Hans de Goede <hdegoede@redhat.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, Andy Shevchenko <andy@kernel.org>, Kate Hsuan <hpa@redhat.com>, Hao Yao <hao.yao@intel.com>, Bingbu Cao <bingbu.cao@intel.com>, linux-media@vger.kernel.org Subject: [PATCH v2 09/15] media: ipu-bridge: Drop early setting of sensor->adev Date: Fri, 30 Jun 2023 13:06:37 +0200 Message-ID: <20230630110643.209761-10-hdegoede@redhat.com> In-Reply-To: <20230630110643.209761-1-hdegoede@redhat.com> References: <20230630110643.209761-1-hdegoede@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham 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: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -4.8 (----) X-LSpam-Report: No, score=-4.8 required=5.0 tests=BAYES_00=-1.9,DKIMWL_WL_HIGH=0.001,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3 autolearn=ham autolearn_force=no |
Series |
media: ipu-bridge: Shared with atomisp, rework VCM instantiation
|
|
Commit Message
Hans de Goede
June 30, 2023, 11:06 a.m. UTC
sensor->adev is no longer dereferenced before it is permanently set by:
sensor->adev = acpi_dev_get(adev);
So the early assignment with a borrowed reference can be dropped.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/media/pci/intel/ipu-bridge.c | 5 -----
1 file changed, 5 deletions(-)
Comments
On Fri, Jun 30, 2023 at 2:07 PM Hans de Goede <hdegoede@redhat.com> wrote: > > sensor->adev is no longer dereferenced before it is permanently set by: > > sensor->adev = acpi_dev_get(adev); > > So the early assignment with a borrowed reference can be dropped. Ah, now I see that that change was temporary. Can we avoid backporting it please?
Hi, On 6/30/23 16:30, Andy Shevchenko wrote: > On Fri, Jun 30, 2023 at 2:07 PM Hans de Goede <hdegoede@redhat.com> wrote: >> >> sensor->adev is no longer dereferenced before it is permanently set by: >> >> sensor->adev = acpi_dev_get(adev); >> >> So the early assignment with a borrowed reference can be dropped. > > Ah, now I see that that change was temporary. Ack > Can we avoid backporting > it please? Patch 1/15 does fix a NULL pointer deref oops, so backporting it would be a good thing to do IMHO. Regards, Hans
On Tue, Jul 04, 2023 at 01:20:33PM +0200, Hans de Goede wrote: > On 6/30/23 16:30, Andy Shevchenko wrote: > > On Fri, Jun 30, 2023 at 2:07 PM Hans de Goede <hdegoede@redhat.com> wrote: > >> > >> sensor->adev is no longer dereferenced before it is permanently set by: > >> > >> sensor->adev = acpi_dev_get(adev); > >> > >> So the early assignment with a borrowed reference can be dropped. > > > > Ah, now I see that that change was temporary. > > Ack > > > Can we avoid backporting > > it please? > > Patch 1/15 does fix a NULL pointer deref oops, so backporting it would > be a good thing to do IMHO. Then better to go with ACPI handle. I don't like the rewriting same field (even if it's the same information). It's prone to errors which might be hard to find.
diff --git a/drivers/media/pci/intel/ipu-bridge.c b/drivers/media/pci/intel/ipu-bridge.c index daa9dde78c64..891dc0b7c960 100644 --- a/drivers/media/pci/intel/ipu-bridge.c +++ b/drivers/media/pci/intel/ipu-bridge.c @@ -342,11 +342,6 @@ static int ipu_bridge_connect_sensor(const struct ipu_sensor_config *cfg, } sensor = &bridge->sensors[bridge->n_sensors]; - /* - * Borrow our adev ref to the sensor for now, on success - * acpi_dev_get(adev) is done further below. - */ - sensor->adev = adev; ret = ipu_bridge_parse_ssdb(adev, sensor); if (ret)