From patchwork Mon Dec 28 12:50:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 352618 Delivered-To: patch@linaro.org Received: by 2002:a17:906:4755:0:0:0:0 with SMTP id j21csp9877227ejs; Mon, 28 Dec 2020 04:59:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJxDuAosi90ruttwgg29G0zEMckxmVsd+Oor0yyBC43v9w8tHownCuZMBqjZ8UxiIPJx0Qvk X-Received: by 2002:a17:906:4e50:: with SMTP id g16mr43106433ejw.191.1609160372913; Mon, 28 Dec 2020 04:59:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609160372; cv=none; d=google.com; s=arc-20160816; b=uEBRuzoImxPLZaIPWuDphnrSPCCdilJs/iS1Cvy9lM8KdtKrPGYg3XpeSLlg3OpiV3 2V5lAwWddMj7FVuLsWXomlwwESHafAU7WqShSHCnJj0hko2JY4/91nLfKDDIJCtK9YT7 dqW8Kz9jXaz3Dvk8/a0q+CESitvwoSnsGUw8Xck0+sE2LldQq04GjWMJjU5XdDq/9nN3 35ZIKdHmJDQ0qRws60G8GVKqyFBYGBRYNQ2Zi64nsA+wDSWu5ZU9chMIpWDo5JME4Bh1 1aY0Cs5zAw/tWIJRxAXuIwRtzV+v8rvskcmWCvfJKQQdlqJwy1GvaD9bkL0dxVort7zI UwzA== 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=j6EvLzoFniyoxR670iclUWvaOeC85/ZapuKVa/cXP5w=; b=LXJveXgsCFw1obVSaEUAsg7Ot1Kr4eehL+8ADsrNZpL2iB4gnZY511Di4Bq89yJ/TB 8wqq6Wte4oBL1Basy5e7YtqKY/dE2Nh+DCTZaeNV75lP0FyeEWP/BGV6ICkKy38cbD/H 9cEePJTVFYbtVdmwzN7pOy115s0pV5Y6KYL/cimBBYguL+AVw4aJ+A6BNRm7zKIKEfqD 19U36JGjLI4yz59V6A6Ujt6h8h1rDVsQWWcarIEe44XlLkFJExwd+clUoRRsXDICH0qe uVEifeEm32zs9DHR37qaB5jmH1ezv/5oVrTIgtcUdq4kd3jkqwFTRTOGH/gAal/mVxRy tgBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jWgeLIp9; 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 q22si19957226edr.578.2020.12.28.04.59.32; Mon, 28 Dec 2020 04:59:32 -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=jWgeLIp9; 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 S1729195AbgL1M6i (ORCPT + 14 others); Mon, 28 Dec 2020 07:58:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:54260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728140AbgL1M6h (ORCPT ); Mon, 28 Dec 2020 07:58:37 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 377B2208BA; Mon, 28 Dec 2020 12:58:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609160301; bh=U/rmShT16J06mM0R42BKT9PDN+UC8RCxGEEbHBvPTYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jWgeLIp9x61JO1Gou7m5vwwtt0qIps9fCCwHh4QkSNuOjtTptS6GgLHWtNUAEW3DL rVn6Kienlp3TCwNmEJ2GjQ+gJQXkSBibcTEa263jK0RvVLcaXYyGFxobTtAhs755SM hPVjGkalorv0nf1Il2hRqHtRfnO3RP7Zp3Gopk8A= 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 4.4 126/132] iio:pressure:mpl3115: Force alignment of buffer Date: Mon, 28 Dec 2020 13:50:10 +0100 Message-Id: <20201228124852.501487166@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124846.409999325@linuxfoundation.org> References: <20201228124846.409999325@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 @@ -139,7 +139,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);