From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0674C433EF for ; Wed, 2 Mar 2022 19:42:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241883AbiCBTnH (ORCPT ); Wed, 2 Mar 2022 14:43:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241971AbiCBTm5 (ORCPT ); Wed, 2 Mar 2022 14:42:57 -0500 Received: from smtp.smtpout.orange.fr (smtp06.smtpout.orange.fr [80.12.242.128]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D78CC7D5D for ; Wed, 2 Mar 2022 11:42:12 -0800 (PST) Received: from [192.168.1.18] ([90.126.236.122]) by smtp.orange.fr with ESMTPA id PUrQnnTCySrXTPUrRnhqIB; Wed, 02 Mar 2022 20:42:09 +0100 X-ME-Helo: [192.168.1.18] X-ME-Auth: YWZlNiIxYWMyZDliZWIzOTcwYTEyYzlhMmU3ZiQ1M2U2MzfzZDfyZTMxZTBkMTYyNDBjNDJlZmQ3ZQ== X-ME-Date: Wed, 02 Mar 2022 20:42:09 +0100 X-ME-IP: 90.126.236.122 Message-ID: Date: Wed, 2 Mar 2022 20:42:08 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: *** SPAM *** [PATCH] i2c: mux: demux-pinctrl: do not deactivate a master that is not active Content-Language: en-US To: Peter Rosin , "linux-i2c@vger.kernel.org" Cc: Wolfram Sang , "linux-kernel@vger.kernel.org" References: From: Marion & Christophe JAILLET In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 02/03/2022 à 12:22, Peter Rosin a écrit : > Attempting to rollback the activation of the current master when > the current master has not been activated is bad. priv->cur_chan > and priv->cur_adap are both still zeroed out and the rollback > may result in attempts to revert an of changeset that has not been > applied and do result in calls to both del and put the zeroed out > i2c_adapter. Maybe it crashes, or whatever, but it's bad in any > case. > > Fixes: e9d1a0a41d44 ("i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()'") > Cc: Christophe JAILLET > Signed-off-by: Peter Rosin > --- > drivers/i2c/muxes/i2c-demux-pinctrl.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > Hi! > > Either that, or I'm missing something. I found this issue when > reading code, and have made no tests to verify if my analysis > is correct. > > Cheers, > Peter > > diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c > index 5365199a31f4..f7a7405d4350 100644 > --- a/drivers/i2c/muxes/i2c-demux-pinctrl.c > +++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c > @@ -261,7 +261,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) > > err = device_create_file(&pdev->dev, &dev_attr_available_masters); > if (err) > - goto err_rollback; > + goto err_rollback_activation; > > err = device_create_file(&pdev->dev, &dev_attr_current_master); > if (err) > @@ -271,8 +271,9 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) > > err_rollback_available: > device_remove_file(&pdev->dev, &dev_attr_available_masters); > -err_rollback: > +err_rollback_activation: > i2c_demux_deactivate_master(priv); > +err_rollback: > for (j = 0; j < i; j++) { > of_node_put(priv->chan[j].parent_np); > of_changeset_destroy(&priv->chan[j].chgset); For what it worth, LGTM. CJ