From patchwork Tue Aug 1 21:54:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 129511 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp51295vqx; Tue, 1 Aug 2023 15:27:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlFFHxsugc4wSSRQKsdxrz5Hknn/JA3B8dsTatrScroP1meEWj4hmHXn3UjpMpwOuaj553Fi X-Received: by 2002:a17:906:32c3:b0:992:b3a3:81f9 with SMTP id k3-20020a17090632c300b00992b3a381f9mr3315563ejk.71.1690928830217; Tue, 01 Aug 2023 15:27:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690928830; cv=none; d=google.com; s=arc-20160816; b=zrFrGgN5+1nUaFqodnDdZtxsrQNOr21iXNIzq8g1fHSki8Lo/Jwup33pteabQcaQpv gMgmnr6PM8OWava7e+//lpfZAZLce4SrbhU0OT0ouRyCOs5xOe/VKLrVqJ3RGnC/MyYA v9mu/Rh3Z3UlTcoYAQnHUvo2Jrk1f4U0Bh7iwz6rjiZhlnKWTnE9oFgSL0a6bBlHmJ29 fYZPiamTz3t3QBL4ME8IR3TCbJriHZmCyxbX0rpKxSUoGAJ1LIgrkeMYpm9L8UZQ12H+ t8r6ucnVViLpLffwIWru5H6v6pQKuhlHnKqt18+B8xdHQ4gz1JMs5aQKGeeycSaGfRU0 Qg+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=/zT9NJtP+J7pPgHqOoouS8K6xGrtJRtOdBih1qtcTxM=; fh=9muYjwzOjeujIiOiqgEm7G2SJDFzcm638Q1NXjJ2Sec=; b=wjIuBmVDNhuD3/BsaAtRc8RmdRl8euWU8c9G1Gj7V1NyDWPJQfZ1u8UQkJ4suBYXIm VjxBfng5lAr2Zp7Z5LHLeW5L5lJO/8NkG1UW+d+eCaG1SDOJkPAOWlRJM8ZqYm+qv9w5 SdLo/qkJCrkcHJfffMvWCjOz88JbGKqie5ti/BEQma02+XhBk5WLWg9IzhH39eUQORmO vxJRX7+gXkWYCSU0OFY0ApCMXJ8KnsyA9Llyjejz8dgoafcLswiqkth5ocUEwHAAN0z+ m8lXt9ge1ttpB4or7EiHOef2xN5Qatzcdke6gOPe3ECXcgyYLqNXUKqu0MPRH0gwNu4w 72XQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WRQx49Oe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g11-20020a170906594b00b00992b55d152esi9181967ejr.242.2023.08.01.15.26.46; Tue, 01 Aug 2023 15:27:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WRQx49Oe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232781AbjHAVz3 (ORCPT + 99 others); Tue, 1 Aug 2023 17:55:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232755AbjHAVzW (ORCPT ); Tue, 1 Aug 2023 17:55:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FC842134; Tue, 1 Aug 2023 14:55:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 88E0161750; Tue, 1 Aug 2023 21:55:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40AABC433C9; Tue, 1 Aug 2023 21:55:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690926920; bh=0701bJOBg95miRQteud7cUM6mXMgwl0E9IlK6sWteVY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WRQx49Oeiy26fg7ZSa6GSgPSjjD7/P8HOJH+OgvWj1VNuw7bW+FbfZfWfOiEb2NgO +v9txqQqn0H3ZMQQrXiglgUgOVAEi56waMkWb+fNANp6VKtLyBDs+cWkyngmSmtv9l Q5F6j7Tw0xFsjc0tiMjzI9vF8oXdpkkmIMbL8WH4QUGSJrib1HbIhqmR7OoUGDsckZ 1IJx0DamqpX/f7sbfP96y0yJS6Kcu3I39EJNhvvFWlou/FUk8rLpVm94VWFBO6yx9W SXT9Dy15dpeBs/R0QjBSEIP2r8NAIXKELcY/AUS3xhvDiCxbl2sFgp/TFFmQEsQOZO yZGU9VukGuFWQ== Received: (nullmailer pid 2469341 invoked by uid 1000); Tue, 01 Aug 2023 21:55:14 -0000 From: Rob Herring Date: Tue, 01 Aug 2023 15:54:46 -0600 Subject: [PATCH 3/5] of: dynamic: Fix race in getting old property when updating property MIME-Version: 1.0 Message-Id: <20230801-dt-changeset-fixes-v1-3-b5203e3fc22f@kernel.org> References: <20230801-dt-changeset-fixes-v1-0-b5203e3fc22f@kernel.org> In-Reply-To: <20230801-dt-changeset-fixes-v1-0-b5203e3fc22f@kernel.org> To: Frank Rowand , "Enrico Weigelt, metux IT consult" , "Rafael J. Wysocki" , Sakari Ailus , Petr Mladek , Andy Shevchenko , Geert Uytterhoeven Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.13-dev X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773067388837134751 X-GMAIL-MSGID: 1773067388837134751 __of_update_property() returns the existing property if there is one, but that value is never added to the changeset. Updates work because the existing property is also retrieved in of_changeset_action(), but that is racy as of_changeset_action() doesn't hold any locks. The property could be changed before the changeset is applied. Signed-off-by: Rob Herring --- drivers/of/dynamic.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index aa3821836937..31603b5a4ffc 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -565,7 +565,7 @@ static int __of_changeset_entry_notify(struct of_changeset_entry *ce, static int __of_changeset_entry_apply(struct of_changeset_entry *ce) { - struct property *old_prop, **propp; + struct property **propp; unsigned long flags; int ret = 0; @@ -606,7 +606,7 @@ static int __of_changeset_entry_apply(struct of_changeset_entry *ce) } } - ret = __of_update_property(ce->np, ce->prop, &old_prop); + ret = __of_update_property(ce->np, ce->prop, &ce->old_prop); break; default: ret = -EINVAL; @@ -908,9 +908,6 @@ int of_changeset_action(struct of_changeset *ocs, unsigned long action, ce->np = of_node_get(np); ce->prop = prop; - if (action == OF_RECONFIG_UPDATE_PROPERTY && prop) - ce->old_prop = of_find_property(np, prop->name, NULL); - /* add it to the list */ list_add_tail(&ce->node, &ocs->entries); return 0;