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;
From:   Markus Burri <markus.burri@mt.com>
To:     linux-kernel@vger.kernel.org
Cc:     Markus Burri <markus.burri@mt.com>,
        Lars-Peter Clausen <lars@metafoo.de>,
        Michael Hennerich <Michael.Hennerich@analog.com>,
        Alexandru Tachici <alexandru.tachici@analog.com>,
        Jonathan Cameron <jic23@kernel.org>, linux-iio@vger.kernel.org
Subject: [PATCH v1] iio: adc: ad7192: store indio_dev into spi driver data
Date:   Mon, 12 Jun 2023 10:08:47 +0200
Message-Id: <20230612080847.39170-1-markus.burri@mt.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PdQGud0YuAd/ZIIQ3h2Jia47NIJvlNFRH5zcyDCY7602+VVnZgkXQKrONrDw?=
 =?us-ascii?Q?yOSQPgvrTz+zH9MhYzhFsHxBcAfYVsWx7PX1E6NochDdGmo/KOhsAY/V4JC+?=
 =?us-ascii?Q?TQWOgBOldXeZnDThmtAALSzKlNOJpkofZMYMuLGEGRLpSoJsddjsrHJkOrXW?=
 =?us-ascii?Q?mHfFQRbfxiyaAlKmm3UdJ+k+iDvprRGYBesD/txvs4rPvQwLRv28wm8nNerS?=
 =?us-ascii?Q?iurXlmruB9GFfVImVWQOr3kNGiW/203vWA+wgP5rOkYFqfZZnPl61Af7X2tu?=
 =?us-ascii?Q?q3YBQiN3chB+b+VBZAryM5Il2PMQq7GI5iBEIfm+Y3SNVCFqv7uQJlReUXKK?=
 =?us-ascii?Q?z1iMzUr0iSPOGU/G65ExJMT4J3G3iZpHZhup9OU+D8zPENZXkkIkYo0CM0aH?=
 =?us-ascii?Q?p1G6ndV47oEyeDOYOIlO/wTHbjdeONs3kbnjpvqYv7gQuvNtlzgr9XBtEhem?=
 =?us-ascii?Q?d5wZpPWnPENDb2ocVVJoCW7F9HdwjbbH97gUtQ/IHXKmpev1mAOMmMg+0lDs?=
 =?us-ascii?Q?yTtxJUXUi39y+Y96o91DZf3qVRgjL5aWUfVQrE7h4iBiFVXx9RtdkkxzOyOZ?=
 =?us-ascii?Q?pQWPlnLQtygbK822ovCLbRuTTqkodcRafw+eIyansEp2Xp06RIGOQMYNYAWr?=
 =?us-ascii?Q?+gBfJYxxvZx05EXDSRQfRc4ZPG3U9QyXMImoRS4syKir3anRlquxAZK3wEb0?=
 =?us-ascii?Q?S1+BV7dTWIqDMOFBQqv20zju3glkYIFmXePUxaFed3YyhFEC8f6tK+3mFYRK?=
 =?us-ascii?Q?KTvlvLOs7uLs6oJlXi7Q/gFFd1RpDt0Em9xr7PYu0XHQZcnI99AdL7hPmzU7?=
 =?us-ascii?Q?nV+dMforP4IGj3rYvtU5AUtIJeyLhqvD+bXJJFgQbm473aA4UTKvmdLWv+js?=
 =?us-ascii?Q?aUHtCj4SXB56xqtxBLM0tCHEoxp3ifUoYmQdPMEo74NiHLE2NPGqzQtsKj0o?=
 =?us-ascii?Q?CoHIVfKBMAn3b2+va6hKyeZoMJSqMVSWmHPerend0pstQ0F0v4jqqUQhd5Na?=
 =?us-ascii?Q?/7rfzncN/11cFEfhhEQIRWQRtN6Yrdd4+XyNdWAb/2PBzyPnMjI9cX7m82oL?=
 =?us-ascii?Q?6k40+iLnhWeIjQxKeg1Jyzxg/bjT5GQIBWW8nhq+evjEZMtyjKGrutLrYkBv?=
 =?us-ascii?Q?QpacwVLY5UvsR5/WnBElxwa2Hl21axDcn3N/vwgwXw5nhr+SR9CIKEBoFn2z?=
 =?us-ascii?Q?HgwO2F1LLXkVIihj/kanK2ff3LLsQFKBRlFR7bSn41L5XaHPncPLdgyl+1iT?=
 =?us-ascii?Q?M5qVoWh3iJBe9iOgUvx5lQy+q7hByduGOCCmCaD/aLLruPoXW+eHeEKdZuuT?=
 =?us-ascii?Q?7v6Gz56EZGP9esI8BwrmNcHXs7ZSj+JGWJTfIZ27QBc4ITJEwYRlMIi1i0Kx?=
 =?us-ascii?Q?Q0Oj99F1O7pGIcyfHhn/tL81Nj0em60QthWxgnh04zV5MVhxq524vbOC2ZkV?=
 =?us-ascii?Q?lbAvqZSZ21aoOVo5XtnBn1fDMOqXLr8qs0nHH6UrbSgoAac5MlXo9weUSLdL?=
 =?us-ascii?Q?lMw4VzUSesYa2XRSlUHu7ep3vwiHAXm2aQ3PGb3kRVnxYYDlL6e68lzJSK1x?=
 =?us-ascii?Q?kuFib17RmWvv0qo2rVAQl4h73/lQndVscXnlGpzw?=
X-OriginatorOrg: mt.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f0ba6fa7-bb1b-4e9e-4e71-08db6b1c4ced
X-MS-Exchange-CrossTenant-AuthSource: PA4PR03MB7488.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2023 08:09:09.7947
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: fb4c0aee-6cd2-482f-a1a5-717e7c02496b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: BeGmukFJht23IvpJsBlsY5VjPewM8PiFJ9Jb6m8CNIPBNwVyQ1EMmBgqJLL7lAONsxI0yIAN4YRKFlb18WGong==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR03MB9902
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

After calibration the indio_dev is used to get channel information.
Since the pointer is not stored into spi driver data, there is a kernel
null pointer dereference.
Store the indio_dev into spi driver data to fix this.
Add error check and slightly extend the debug messages.

Signed-off-by: Markus Burri <markus.burri@mt.com>
---
 drivers/iio/adc/ad7192.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/iio/adc/ad7192.c b/drivers/iio/adc/ad7192.c
index d71977be7..7c2ead72b 100644
--- a/drivers/iio/adc/ad7192.c
+++ b/drivers/iio/adc/ad7192.c
@@ -403,8 +403,8 @@ static int ad7192_setup(struct ad7192_state *st, struct device_node *np)
 	id &= AD7192_ID_MASK;
 
 	if (id != st->chip_info->chip_id)
-		dev_warn(&st->sd.spi->dev, "device ID query failed (0x%X)\n",
-			 id);
+		dev_warn(&st->sd.spi->dev, "device ID query failed (0x%X != 0x%X)\n",
+			 id, st->chip_info->chip_id);
 
 	st->mode = AD7192_MODE_SEL(AD7192_MODE_IDLE) |
 		AD7192_MODE_CLKSRC(st->clock_sel) |
@@ -998,6 +998,7 @@ static int ad7192_probe(struct spi_device *spi)
 		return -ENOMEM;
 
 	st = iio_priv(indio_dev);
+	spi_set_drvdata(spi, indio_dev);
 
 	mutex_init(&st->lock);
 
@@ -1049,7 +1050,9 @@ static int ad7192_probe(struct spi_device *spi)
 	else
 		indio_dev->info = &ad7192_info;
 
-	ad_sd_init(&st->sd, indio_dev, spi, &ad7192_sigma_delta_info);
+	ret = ad_sd_init(&st->sd, indio_dev, spi, &ad7192_sigma_delta_info);
+	if (ret)
+		return ret;
 
 	ret = devm_ad_sd_setup_buffer_and_trigger(&spi->dev, indio_dev);
 	if (ret)
@@ -1077,7 +1080,7 @@ static int ad7192_probe(struct spi_device *spi)
 		st->fclk = clk_get_rate(st->mclk);
 		if (!ad7192_valid_external_frequency(st->fclk)) {
 			dev_err(&spi->dev,
-				"External clock frequency out of bounds\n");
+				"External clock frequency out of bounds (clk:%d)\n", st->fclk);
 			return -EINVAL;
 		}
 	}
-- 
2.39.2