From patchwork Mon Jul 12 06:10:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 473039 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2713855jao; Mon, 12 Jul 2021 01:11:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpLj7qhjVUwBFt1/hLmJK3SzpO1vHvzmYR4wtdf8TTsCdQnIyzgwwFH7RBr+96hi8Vfa+g X-Received: by 2002:a17:907:212f:: with SMTP id qo15mr11943169ejb.400.1626077461804; Mon, 12 Jul 2021 01:11:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626077461; cv=none; d=google.com; s=arc-20160816; b=D9lHGlPff834pwihhT/nTj1lkfJjd7iCfjfPENPo1issKQrre25mP8sXnstiYpFOQ2 cr05odKHfMIrk1yP+Qc7XiI57+qr6yGPqwU0LP6rp02DSg3unOb4Zo3q5MnM7XnCOu72 RTWCU0j9oKFH1NfccFY326dSxZlyEBFLg8Y86QIt8+x1FnzSLRx1Cf4A/VuBE/ubploI domk26xDoXPL36HoWEgAeRUKWr8O90jrXhjm8gVs1BbbuWShvoyh77sqzaD6AksHQ6Mo wSJibnhCfNVri9yomqm3dT5r08tHr8g6zIm5OxDJo8rI1H+WGP81fQyGrIIhO9kEukGT +KQA== 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=mlGg97ZfO8PtySt7dAtzzKRpOkSx/VNSKV64UuDGKPQ=; b=NSPflRvorxCGJ4W25SvLU0f1DXhpGmdlLe0sX76BuazIxpi2nNqnmMFPVha9iInUO5 lF9u0ZIiRrq2vmH9WvHJvbfN3i2ttJRWG9BTKm5+hM1MqsT/zZHg/FydiUhSHyYUe2D+ thJKrLxEK06BRH9l3lR1rcr6Xgt7sGwbZyfiP+lohji0/2iIF4EbSGIM8GMkSWDbVdCD 8zBNqIfvL0G88adJrdvVPRTtqoJmtUqUOKl1lKGi8xQuv+rk5I+MCoUTY9E0Ok3+j046 lQ8iy6B5pXSdZfViRdP4HUluVwivVk8V3CM4G0d4zi9QZKBlVSqSX4ygejym3Z1Ac2SH bU5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FS71mPO8; 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.01; Mon, 12 Jul 2021 01:11:01 -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=FS71mPO8; 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 S1348855AbhGLIJL (ORCPT + 12 others); Mon, 12 Jul 2021 04:09:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:55048 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352558AbhGLH7a (ORCPT ); Mon, 12 Jul 2021 03:59:30 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E5AAA6121E; Mon, 12 Jul 2021 07:53:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076405; bh=Y5sqhl7vGCD/Fo1vGrurc/rVFPsxLRPAdq/tskAXSp8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FS71mPO8T4CQhtfysCpjRt1xxVwBJ01zgK72ikKXgg342agPttMzckD/Po+kpro8S bQzu+Pmyc0K1GuMtKqCo1Picq05zQ7fK671SrvgsXV90X+I4wQeCHQh3d76CbEZ6Ut egTq4mkp++RPoKLqY7UoAuPSiq1fgxg0vvZ/ZI4Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Matt Ranostay , Andy Shevchenko , Sasha Levin Subject: [PATCH 5.13 629/800] iio: prox: as3935: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:52 +0200 Message-Id: <20210712061034.115001639@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 37eb8d8c64f2ecb3a5521ba1cc1fad973adfae41 ] 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: 37b1ba2c68cf ("iio: proximity: as3935: fix buffer stack trashing") Signed-off-by: Jonathan Cameron Cc: Matt Ranostay Acked-by: Matt Ranostay Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-15-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/proximity/as3935.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c index edc4a35ae66d..1d5ace2bde44 100644 --- a/drivers/iio/proximity/as3935.c +++ b/drivers/iio/proximity/as3935.c @@ -59,7 +59,11 @@ struct as3935_state { unsigned long noise_tripped; u32 tune_cap; u32 nflwdth_reg; - u8 buffer[16]; /* 8-bit data + 56-bit padding + 64-bit timestamp */ + /* Ensure timestamp is naturally aligned */ + struct { + u8 chan; + s64 timestamp __aligned(8); + } scan; u8 buf[2] ____cacheline_aligned; }; @@ -225,8 +229,8 @@ static irqreturn_t as3935_trigger_handler(int irq, void *private) if (ret) goto err_read; - st->buffer[0] = val & AS3935_DATA_MASK; - iio_push_to_buffers_with_timestamp(indio_dev, &st->buffer, + st->scan.chan = val & AS3935_DATA_MASK; + iio_push_to_buffers_with_timestamp(indio_dev, &st->scan, iio_get_time_ns(indio_dev)); err_read: iio_trigger_notify_done(indio_dev->trig);