From patchwork Mon Dec 28 12:51:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 352657 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp9765059jai; Mon, 28 Dec 2020 05:59:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJxLESQyTK1bR7Vd1TzFPT6CX5IytwfeIPCEYl1K/zrujBepflgeFcFQr+SyQQjaTzgayHB+ X-Received: by 2002:a17:906:4e52:: with SMTP id g18mr42983575ejw.385.1609163970647; Mon, 28 Dec 2020 05:59:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609163970; cv=none; d=google.com; s=arc-20160816; b=IX7xgzkgXj5xbLMbMXGSqM7A6FTNIzSEOe6K0Ygycdpw9fn4Q7I5q78b3YCUbWP+Ko GQo68fmDyti6gQ6AtHcRe1srBlmOcwqHc4xOCenZhGlcbX0aymC916uH4kDnx0e9XBum PcqMf/tOtXquc0RmJpkOt8M4X7N0uMHmYpZnzBlXLiR8/SBYAgeBo1rz/Nlq5llgCQnH FkVeySeslN6AzUCd5ZvILXJACsjvq0YFfdoIncoXZM4FeiNFMA6EZ4zhacWxpd7/oBLK gqH5cpR8Y/bXtoY11RjvzxwVJbbPHxPfDHW3r0rtMg9uzUYMKZvgCtgQ7h6YuZFVox1f NA6w== 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=ynqT+9ppsM3Rf2Xfhsma5Y2Vo+wR/luV+WZn3BB6wWQA+m1IVXzyeE8h1dZizQX+b9 vMwCNY0QuCcQPOgMaD1v+B1Ph1o9etBi4bdAAYVOMT+4spgPgLZJfWADi654Ll9c9Qr1 zjw2NxY4erYkPeXmBJ7PVd0uSWu860jbw8X8yfhYhnxEAddTovdF4VGWTPOqLWxEnRRe i20LlGL91SnrgcUindz2KyaezyDvhx2cIhuz4AOEj4ECxbf13OjmTIGeRfaXcHHFQAeo amTnl+4buTEmcHqUv9Ylo6kSJvFFyhx82T/U6L/DTUAzyaCxpvAi05B6o+12SbkW4LCB NFjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZmSnDNFv; 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 e14si19256777ejj.571.2020.12.28.05.59.30; Mon, 28 Dec 2020 05:59:30 -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=ZmSnDNFv; 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 S2406806AbgL1N5r (ORCPT + 14 others); Mon, 28 Dec 2020 08:57:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:58762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406778AbgL1N5r (ORCPT ); Mon, 28 Dec 2020 08:57:47 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 49A4620738; Mon, 28 Dec 2020 13:57:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609163851; bh=M+utYt6pr6YBpAd8O1kfh4QtaFja7vdkmDgoY6zssAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZmSnDNFv7TNcRRBWsP5+XCBHP3DA3agA8hIYl9C+rARVbUBYMdXz40sKWsOqPh+wy qgk9iPRxTAodjfSzDYfoBm77YMymT4Bf4UIXF3t/cWzi8h15CSM3rjwY5yokjS0GP5 HxuqXYvkKjKq2r181l1YQo039dNzNLJs60IW4tGI= 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.4 430/453] iio:pressure:mpl3115: Force alignment of buffer Date: Mon, 28 Dec 2020 13:51:06 +0100 Message-Id: <20201228124957.916149593@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124937.240114599@linuxfoundation.org> References: <20201228124937.240114599@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);