From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3F7A1B1519; Thu, 6 Jun 2024 14:16:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683397; cv=none; b=Ucv/CJ2nuHIiNvQXriptx6o0haRNe5czHBcfzFze2tMUxOvSb+65Jg3Vwp0RtA+LqO3Dtw+aYK4vX+7mat9TxSAirc3ePfJeqgkwjNIaSw/z9byywFvXuRPbRLcaIkqsX54ez/PJlizijR2WP+MVhjtmczklyJrLLTcHNyp7sIE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683397; c=relaxed/simple; bh=iOsWejZw8qIBGumMVSQxMgM1SGbdMm5ySHhMAScpO9M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=onfSVUPxr3+y3VofoWOdsKlLMGXmx7BLfGWzxaM+QB91Kv4DtIJR5xCRdt8SExWQjjWSahvJqo5jAthHx+6zxboyXtQaSEyV3G4GrDTcVDVjFEWBSm//9VHYRHJkmL4+jCQ8HHJjufwlc0+Gvk0TQDjWUqo3GXRlZNin7Ht1FhI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XtWcp5gc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="XtWcp5gc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93E73C32781; Thu, 6 Jun 2024 14:16:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717683397; bh=iOsWejZw8qIBGumMVSQxMgM1SGbdMm5ySHhMAScpO9M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XtWcp5gcrPYpuW+cq6q9zuTR76o7wWyVJnhWP45JUn2tcTp/5b316NsR4CVtvAtyp glQRN/vZD/5btd7crY2iDzcynulFdoh7al3OJnS615oYWfncgENe+MgZNCkuhAAKu8 EjpmJRv8sRWrstvqPvzh2XkaP8w0LoawQpvCHO38= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andy Shevchenko , David Lechner , Jonathan Cameron , Sasha Levin Subject: [PATCH 6.1 281/473] iio: core: Leave private pointer NULL when no private data supplied Date: Thu, 6 Jun 2024 16:03:30 +0200 Message-ID: <20240606131709.195613515@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131659.786180261@linuxfoundation.org> References: <20240606131659.786180261@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andy Shevchenko [ Upstream commit f0245ab389330cbc1d187e358a5b890d9f5383db ] In iio_device_alloc() when size of the private data is 0, the private pointer is calculated to point behind the valid data. Leave it NULL when no private data supplied. Fixes: 6d4ebd565d15 ("iio: core: wrap IIO device into an iio_dev_opaque object") Signed-off-by: Andy Shevchenko Reviewed-by: David Lechner Link: https://lore.kernel.org/r/20240304140650.977784-2-andriy.shevchenko@linux.intel.com Signed-off-by: Jonathan Cameron Signed-off-by: Sasha Levin --- drivers/iio/industrialio-core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index a2f8278f00856..135a86fc94531 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -1670,8 +1670,10 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv) return NULL; indio_dev = &iio_dev_opaque->indio_dev; - indio_dev->priv = (char *)iio_dev_opaque + - ALIGN(sizeof(struct iio_dev_opaque), IIO_DMA_MINALIGN); + + if (sizeof_priv) + indio_dev->priv = (char *)iio_dev_opaque + + ALIGN(sizeof(*iio_dev_opaque), IIO_DMA_MINALIGN); indio_dev->dev.parent = parent; indio_dev->dev.type = &iio_device_type; -- 2.43.0