From patchwork Mon Jul 19 14:50:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 479910 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4227005jao; Mon, 19 Jul 2021 08:23:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1tqR2rvic/3hDNRdBQKKkZtQQO7btNCzK4V2VvswmIJ2fKYwXhAHex/PO8Lfv6RxijLB+ X-Received: by 2002:a02:2382:: with SMTP id u124mr22067833jau.138.1626708181542; Mon, 19 Jul 2021 08:23:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626708181; cv=none; d=google.com; s=arc-20160816; b=ND4BBJnu4w4tVPPpBUcNkkVVvtVl0z4b+mdFoH9oyXCdMcX4iCmARQJM21Qgd+uHpF VM34Y7Q3+61UiwPudztjAiqa4gSO+GfmOs2DyVJDKO5yOE5huGJ13Hp5H2J+J7ieXKX3 JD9NSipN8KlYMwXaCk82ZStM8yxi2AH9kiZuvfHkg5lO2IbKAwTAaxKY7BHlCo2xVjhP cHtKPT4IB2eVC0FFvEcHRazf11FmagL4zmGpmxlNHTaTiqnFGNq6aLNkQBu22PBbh2nj +CWqVkdY95V4ZJM9d/dNdLO1gm3GRSo/cPK0OWCLe+6dlBpyCL3VFKJ7MhmwL/CJa7Nj zDTQ== 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=6pNy1FMGgziF/rfjbaEexS/xaZOFIMNonA5TkKLcK8I=; b=IkBtmKlb0lsEeqeV2vyp/cV9hfsI6VzmBrm6dQabzfA6b88YMcnRZpHrZ+wd3D2eKe OFllJjqN9PKRDmm7rZf1/o96gg3vg93Sdl7Bu0cnCOv3OnlSXGMZXFK+PFu8vrVCfo4S WU12wIxlHLZ9UvBD4AUPhj/GXmYK/Or0BKFu2RdtylEc/MwyAew8xMmYb219hsZ/7RLs eGUypjr+8FUxzcfZE7N3UYroszQtdNkSU9DXQfZRiNNXXHFa4YeevSEcl5cA3Ewhi5ZY FoGI8gMTbWp+m0heYBzzFJxG/hSy5TjsY81wRYj8tMnlQ7I5CK3OYizUb1MxPpm+Zcyd N6DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QZTX2M0d; 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 g15si9692004iln.71.2021.07.19.08.23.01; Mon, 19 Jul 2021 08:23: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=QZTX2M0d; 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 S245510AbhGSOmT (ORCPT + 12 others); Mon, 19 Jul 2021 10:42:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:56022 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343791AbhGSOjp (ORCPT ); Mon, 19 Jul 2021 10:39:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4D99261396; Mon, 19 Jul 2021 15:19:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626707982; bh=mTz0aJ/ESEpGMNlcs5NRMqIYsgbULkWsi+Ryo5/kJS4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QZTX2M0dlHRoPC4Lomwsfi0kYWSJG/xd4aA7Di05NeYb1wmnpXrkK+3C1hVgZslb+ zBAjpvnYPhKa3Dk5oH4V5urzP85p9z4Le9kqWnvPuicssjzhFkFtpPzA1YP1wUuCM7 2pMRmrzrJmtPWzeTur4T95CnDx6WidphuAb7ykZo= 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 4.14 133/315] iio: prox: as3935: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:50:22 +0200 Message-Id: <20210719144947.253877430@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144942.861561397@linuxfoundation.org> References: <20210719144942.861561397@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 4a48b7ba3a1c..105fe680e8ca 100644 --- a/drivers/iio/proximity/as3935.c +++ b/drivers/iio/proximity/as3935.c @@ -70,7 +70,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; }; @@ -237,8 +241,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);