From patchwork Mon Jul 12 06:10:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472929 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2663252jao; Sun, 11 Jul 2021 23:54:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkz0VGOv8wQR4ui1QtYn2k02sn/jfVn6pXgxXZlk4jVpRZxEtIsnevMTnNI9rIqm36Cb35 X-Received: by 2002:a17:906:8252:: with SMTP id f18mr28069525ejx.261.1626072865655; Sun, 11 Jul 2021 23:54:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626072865; cv=none; d=google.com; s=arc-20160816; b=FX7gkEeIoj/7Hnp+4JqUAimlNkpUcsso4pcrNcw/9DGmLacc2G1n9L1pwARHqnCVav MXEdR8BInM/vAz/u3FrbZbVn9o0RifELo+9oZrN80aTDG9a43NH1adyrJaBfXKJL/9sP bivn/rX1MezIl12pPZ0AJ2gX3+N9lEbV8X1zTXPKf5BCI+JBBu26wAdj9TZxaiMygdtH /76Me8B5nbXX2O4ClnbP+woDms8Iih2geBlkyUEHMnPgcE+ucdE0RGWCTs05Bn2H1LQl c29Nsz/XlMeWohCWff2HdpG73lg5S99SndUQM+i8n/z+0oFK+f7MJcGo1DlwGvBCuu49 eMfQ== 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=6e2AKJGMA1j4P23V6qgzPNQ08qmeNAsLpPMjPGhlcIU=; b=tPs85dbuWZY8v/QcSr4mXD7es7c89eXc2BuoumCQE5IBeBKaCHS+47K/ehRRFc7Kd/ AyHZYGmMsMvRgaG939QpZ8g5exMtdb+IWFzuZsZCDXdAdoNQZofSW94E+gERVks+e4gj ucM40AFYwa+WHhmBAfIdMDix4MtWAh6aXdgpoeEmaQBhNjLEWkCWbbIupmoVdSimtVvt NOhKS9M5+y6kba7XGS63cDu/CFRLBLIXtNYQq3QxKqkUOJb4KA4gUXKqf0GZyVSQUtlu pRLLDYEtRcUaHiNKfqQyJiKFFEE2gNPeSEnKFlJGIroWQaBDBBnKsq9dBhIzElo/eeu/ pUCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zkC+9JLy; 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 r25si3440466edp.437.2021.07.11.23.54.25; Sun, 11 Jul 2021 23:54:25 -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=zkC+9JLy; 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 S240622AbhGLG4f (ORCPT + 12 others); Mon, 12 Jul 2021 02:56:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:48248 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239048AbhGLGt2 (ORCPT ); Mon, 12 Jul 2021 02:49:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CA81E61263; Mon, 12 Jul 2021 06:45:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072340; bh=e/KKfcWa+CIdZ83CTH8/LMGfbSFDCGfD8TBqyrOQMtM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zkC+9JLy09p7YNTLTIWZ/Myj/Jb4C1b1Xhyc7WzHVPgS8mEA7GN9Nbc5qVZtm+VwZ aW9OLWamKsfqorQWZKlyPilHtOfoe3tMe6K+7fUPjvHJF/fKfmXcnKVEvwZXvMdXAo FNA1C+5OR9YOmy5jaCfWmAJyhlsg6JAi4BiW8zUo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Andreas Klinger , Andy Shevchenko , Sasha Levin Subject: [PATCH 5.10 456/593] iio: prox: srf08: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:16 +0200 Message-Id: <20210712060939.585740233@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@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 19f1a254fe4949fff1e67db386409f48cf438bd7 ] 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: 78f839029e1d ("iio: distance: srf08: add IIO driver for us ranger") Signed-off-by: Jonathan Cameron Cc: Andreas Klinger Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-13-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/proximity/srf08.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.30.2 diff --git a/drivers/iio/proximity/srf08.c b/drivers/iio/proximity/srf08.c index 70beac5c9c1d..9b0886760f76 100644 --- a/drivers/iio/proximity/srf08.c +++ b/drivers/iio/proximity/srf08.c @@ -63,11 +63,11 @@ struct srf08_data { int range_mm; struct mutex lock; - /* - * triggered buffer - * 1x16-bit channel + 3x16 padding + 4x16 timestamp - */ - s16 buffer[8]; + /* Ensure timestamp is naturally aligned */ + struct { + s16 chan; + s64 timestamp __aligned(8); + } scan; /* Sensor-Type */ enum srf08_sensor_type sensor_type; @@ -190,9 +190,9 @@ static irqreturn_t srf08_trigger_handler(int irq, void *p) mutex_lock(&data->lock); - data->buffer[0] = sensor_data; + data->scan.chan = sensor_data; iio_push_to_buffers_with_timestamp(indio_dev, - data->buffer, pf->timestamp); + &data->scan, pf->timestamp); mutex_unlock(&data->lock); err: