From patchwork Mon Jul 12 06:10:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472934 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2664079jao; Sun, 11 Jul 2021 23:55:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhOD1Ld2RhFkJG/y9rPyz3mzHwrlfgbY4GZ9DsYfeBZWWh+v6glUofHXLBd9tbQHG24jbW X-Received: by 2002:aa7:d457:: with SMTP id q23mr39605942edr.324.1626072866616; Sun, 11 Jul 2021 23:54:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626072866; cv=none; d=google.com; s=arc-20160816; b=D0hrYWOPVKetJF4uPNNzvJzc5svphPuxfbsIgOVhCnB9ZaqXhPFa8InEha8mJ7dwPb K5bCI/13GJ0FFKbc05UDThYNoyWmE3kTFggY7/QaZXq/a0kLiU6ibWU4I5IHS4v7429J CjCyHv1oTUfP1eciJKshrRAzzoVifIS21Hrzdq4oyD40BTyN+jxfOqocaebestZX06Eu egiGf7aEdHRXYFuqycMWrtkD79LZkh60yqJ+j5z5PZ6jR5QTOpoLmYE9RA7XDZUXn/bt BLYx9efOtxxHpsDukVia3i65jwxWlV2RvNF3wJJAAnQhOJ+mYu6Y7oAldgzDh9nT4cJi P/cQ== 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=eEZJbmxRo8/UDLxJQ3+zQmYtd6juE3BTlUZKFI9sVMo=; b=giFNtg/f76S2KBJ6QwNk7bgiXDCoN1gCjYaB1xKRySHizqn51iZyvPcHw8L4ILKlO9 KENyEkLtrOD/VfIQBIOgW7RlZ2KJFDukQQYx6ibiajI3ifpGqhDHOGopD6bypCgUNU4O qklOHXf5hW4qRhaaAFC5l6qstco5BKkBVg4pEMrD8wAWqTQvSFX+HA+GyfIDLipp5U1m k1PJWb8VPiDgkQ/isF7IYDgT+MoEQftAMgXFzIEacMVvSJFIbzWXF9+KPRWQUjtqHVfv 5UBPlBbuct13NTXBgwExUiHd8+lAlM0R/U6kgVYcBvIjWhp9118Qi4f9d5V8w2CNwSv7 lV9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Mb9jnr2Q; 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.26; Sun, 11 Jul 2021 23:54:26 -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=Mb9jnr2Q; 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 S239059AbhGLG4f (ORCPT + 12 others); Mon, 12 Jul 2021 02:56:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:49170 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239054AbhGLGt2 (ORCPT ); Mon, 12 Jul 2021 02:49:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CC5EB60FD8; Mon, 12 Jul 2021 06:45:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072347; bh=mwf9hJLWPNOdLFUEIsrdC1GGvFET8eaxuSIu33tcvkM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mb9jnr2Qry6f5sMCZ+N8/wiu68mS2WRcUZOajOf5/J75Qqug0yP8kuLBdx2WcAkVJ bC/J6U+BuneOkL9TZI+ZYXW2wVGpLBDSn9pcBpbtNDP944SfS5iNJBmk/9233/qBBt 4LY5MyggR1S968aGGi2BEwvMveFA+FVAmfgX5Q00= 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.10 458/593] iio: prox: as3935: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:18 +0200 Message-Id: <20210712060939.837630603@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 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 b79ada839e01..98330e26ac3b 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);