From patchwork Mon Dec 28 12:51:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 352675 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp9796387jai; Mon, 28 Dec 2020 06:41:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxIGGN8rD7wNexXGXSixA1Hsc39jz0xUGJl9MExRPH6gDNs+Wxn6T1XvddKB3G2TSGLgKKY X-Received: by 2002:a17:906:7784:: with SMTP id s4mr42105573ejm.93.1609166489679; Mon, 28 Dec 2020 06:41:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609166489; cv=none; d=google.com; s=arc-20160816; b=EETDvzY9AHxA6ceb+XBb9/EZMHRy9V4WZIOUQAx0u5EDQ1UtLwtV3OPShTdClkDY3c pyGP4znz7vlHjZ3Sn6dZMkns3DMU94Q4tTDXefHbcasGqntMA4K7G7m9aKQtojHKi2hU XOCORRQZeGqdhK/DbJbJ9DL+S7n4NnBKWEg/xoSMEJSUzh0n6lkII+QaCcFKWlLhBRzL X43NiX7X8uYOnwqzbuWmLJ8Wlvv/G/CYox0PPq50HN/LkrYIcwHlHR1yPsfH3w82G3Ka 3kQqaUoHi+eSSVZsDB6nIM24tsxC1TiC4TU0Al9cxP6yIuRFT22Hqr221fFnX/nylEdT KtBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nx3MB/HB7GBr5gmj10bNcjc6PPffV2L+TU+M5pu010g=; b=bP7x6kQxTZiWEDpZLVaHDerUr3IgG9bXvX8ONIYj0ZrgvyzxPonjpu04oWXTdPQD0I k3Q9Oc3NTzMa5EJGY7pzzOh3MDDOSuxGQG3WGCFU2hUdg34zPIAawq0OADcqi3NcTFNY JhCqjEGnE0DYX6XJcqt3uXSFNAt6VY5dsideMupz737VPr6x3ah5sKmIPOXwmyg/LULR A6uqZRnpifUgRNkv7ZYAFufGHhS5FPKDkIWosSNlLyc+CJYKBxBSUK2ISvoLfe09rbPl 324dOJgIfxfN+pja92t9gGX3xXY5iDycwHMv4WjV3CjahdAXRNx+/QYfTw3PYPxlXi+2 Quug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="RDxer4/r"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id os24si19005124ejb.680.2020.12.28.06.41.29; Mon, 28 Dec 2020 06:41:29 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="RDxer4/r"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2505606AbgL1Og1 (ORCPT + 14 others); Mon, 28 Dec 2020 09:36:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:41024 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2504886AbgL1OdF (ORCPT ); Mon, 28 Dec 2020 09:33:05 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 00155224D2; Mon, 28 Dec 2020 14:32:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609165944; bh=M+utYt6pr6YBpAd8O1kfh4QtaFja7vdkmDgoY6zssAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RDxer4/rkV6Q3pNQ4OxDxQS3z5plGMjOFu5Ekk/oQ0jloSwlY8xAK0XjpLIMa84lS bymtAe+ReyknmErc4wwMzhJvOYctDydam4O4O0p05XEyKHkwngclzVS03b6DlvS2zT Ef3YHMGR0zdmMsRdDHsKdqrjspZ3/BKZlIWBEJ+c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lars-Peter Clausen , Jonathan Cameron , Andy Shevchenko , Alexandru Ardelean , Peter Meerwald , Stable@vger.kernel.org Subject: [PATCH 5.10 680/717] iio:pressure:mpl3115: Force alignment of buffer Date: Mon, 28 Dec 2020 13:51:18 +0100 Message-Id: <20201228125053.558187217@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228125020.963311703@linuxfoundation.org> References: <20201228125020.963311703@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jonathan Cameron commit 198cf32f0503d2ad60d320b95ef6fb8243db857f upstream. Whilst this is another case of the issue Lars reported with an array of elements of smaller than 8 bytes being passed to iio_push_to_buffers_with_timestamp(), the solution here is a bit different from the other cases and relies on __aligned working on the stack (true since 4.6?) This one is unusual. We have to do an explicit memset() each time as we are reading 3 bytes into a potential 4 byte channel which may sometimes be a 2 byte channel depending on what is enabled. As such, moving the buffer to the heap in the iio_priv structure doesn't save us much. We can't use a nice explicit structure on the stack either as the data channels have different storage sizes and are all separately controlled. Fixes: cc26ad455f57 ("iio: Add Freescale MPL3115A2 pressure / temperature sensor driver") Reported-by: Lars-Peter Clausen Signed-off-by: Jonathan Cameron Reviewed-by: Andy Shevchenko Reviewed-by: Alexandru Ardelean Cc: Peter Meerwald Cc: Link: https://lore.kernel.org/r/20200920112742.170751-7-jic23@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/iio/pressure/mpl3115.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) --- a/drivers/iio/pressure/mpl3115.c +++ b/drivers/iio/pressure/mpl3115.c @@ -144,7 +144,14 @@ static irqreturn_t mpl3115_trigger_handl struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct mpl3115_data *data = iio_priv(indio_dev); - u8 buffer[16]; /* 32-bit channel + 16-bit channel + padding + ts */ + /* + * 32-bit channel + 16-bit channel + padding + ts + * Note that it is possible for only one of the first 2 + * channels to be enabled. If that happens, the first element + * of the buffer may be either 16 or 32-bits. As such we cannot + * use a simple structure definition to express this data layout. + */ + u8 buffer[16] __aligned(8); int ret, pos = 0; mutex_lock(&data->lock);