From patchwork Mon Jul 12 06:10:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 473047 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2714120jao; Mon, 12 Jul 2021 01:11:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGnGluzxKHmz3QvgjjVo9VaYAK+VzDgn9r8v1tXsf8IpgWKD0SZhp/xciiSxQyOadEMPMc X-Received: by 2002:a05:6402:2552:: with SMTP id l18mr64486361edb.363.1626077482744; Mon, 12 Jul 2021 01:11:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626077482; cv=none; d=google.com; s=arc-20160816; b=dSJUlb7ro9MfzWRi9wLvNtSCAWnG8jVj/+rCj8SvPNy5mSnqkaOjpUYqoOw/85ySCM 9sH193sVVkI7cCq5xzFw7F/xGqGgxA7ypSvWKMIs2xSnUtKoGyVolY3HnKkGTUCCoN/j CK8fzT05WG70trtbKLyuZbOfOMzHFejtLATZYbnOK7vG0tKASQAu2Hu5Ds83tF2IQIuV Y34pbqbuSm3boYjFVK3x+/3d2pZHtKP6Kq/MljV9oS14O5V/FHlmKnYrOjU0P4VhU3WG BXWiZvGrhvv5qezJ8QtsCasx5uFtgnzTNPVCgakCMcT835jCjJFhhxLtHYBpxhkcwMGh adxw== 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=BrgWfoBNUAmO4ugJ2rfvyhn/OOkcpsWRIA0Xl8/Gb7k=; b=nl/F8YWbdKo9YAf+BjNzKC0p8A6e/WrREjjEsD8Tym8WylBQDidiW9/SeRhH4CffNQ keMmu9j3iUdd37FsYuubK1WFLx75XdZkIOdHtNBZln7AfaFSomRKqATXFfTLmQlFMlhR fSggd40p89A8WCQ/vCQjkO4lA2OD4GrihZ1nSPwyFt3UARLoX/mh6zYhcH7S0EpdUGjW xnt+wX+ebLrrbOBCWdgjeOlMzCyBUTtRpn04utRexXKnatFVYqwVXhfSXRv8U+cYQ5uK cP6Mc+iz3OtC+kxJhJo7VYUHxlPtAZKthlF+i3qVzYQvPlyTqFkjrRE70QqV4UDi9wgE WZLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=aIAAhwd0; 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 n21si13642925eda.13.2021.07.12.01.11.22; Mon, 12 Jul 2021 01:11:22 -0700 (PDT) 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=aIAAhwd0; 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 S1353444AbhGLIJX (ORCPT + 12 others); Mon, 12 Jul 2021 04:09:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:55666 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352871AbhGLIAI (ORCPT ); Mon, 12 Jul 2021 04:00:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5950D61C1A; Mon, 12 Jul 2021 07:53:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076416; bh=4v+nseQdWKDdrAUHjCL5B0ijZTrXt6zOPA7+ThEi7D4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aIAAhwd03BhsMes8n1yr72NAY9BI6nLjyF2/kyA2fX1VmMzG0PvXKRLWzXxJ1vKtE PAhr7wiI2LN7/0qu1jkDoPGCtqxAduA5xHJzaYVc+ABDV0uossfVd55+c+e7h4OXyU ufmSDaze0EBWY2+s5xhb8OpAFUROfGj/rVNtVQ3g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Andy Shevchenko , Sasha Levin Subject: [PATCH 5.13 634/800] iio: light: tcs3472: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:57 +0200 Message-Id: <20210712061034.592988897@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060912.995381202@linuxfoundation.org> References: <20210712060912.995381202@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 [ Upstream commit df2f37cffd6ed486d613e7ee22aadc8e49ae2dd3 ] To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned. Found during an audit of all calls of uses of iio_push_to_buffers_with_timestamp(). Fixes tag is not strictly accurate as prior to that patch there was potentially an unaligned write. However, any backport past there will need to be done manually. Fixes: 0624bf847dd0 ("iio:tcs3472: Use iio_push_to_buffers_with_timestamp()") Signed-off-by: Jonathan Cameron Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-20-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/light/tcs3472.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/iio/light/tcs3472.c b/drivers/iio/light/tcs3472.c index b41068492338..371c6a39a165 100644 --- a/drivers/iio/light/tcs3472.c +++ b/drivers/iio/light/tcs3472.c @@ -64,7 +64,11 @@ struct tcs3472_data { u8 control; u8 atime; u8 apers; - u16 buffer[8]; /* 4 16-bit channels + 64-bit timestamp */ + /* Ensure timestamp is naturally aligned */ + struct { + u16 chans[4]; + s64 timestamp __aligned(8); + } scan; }; static const struct iio_event_spec tcs3472_events[] = { @@ -386,10 +390,10 @@ static irqreturn_t tcs3472_trigger_handler(int irq, void *p) if (ret < 0) goto done; - data->buffer[j++] = ret; + data->scan.chans[j++] = ret; } - iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, + iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, iio_get_time_ns(indio_dev)); done: