From patchwork Mon Jul 19 14:49:51 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: 479956 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4244999jao; Mon, 19 Jul 2021 08:43:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9yyfLg/aWTmXq1eIczC8i37XwCJtBnyxp/9ZksVcxR2xRs9KKDpS1T9PKpATt8+Xh0heR X-Received: by 2002:a6b:2bd6:: with SMTP id r205mr19640478ior.122.1626709382751; Mon, 19 Jul 2021 08:43:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709382; cv=none; d=google.com; s=arc-20160816; b=nf1U9skxeTxO5OIERIreEBJbeZr7uTuar++UIj/oO/bGkPoxEEAybgZY3ZFC2wg0ec xdeyuex9RrjfmmyvOEp4Cte/mVLp1lSrlYjH7tmY0/NFW4LugDn0JopGqEn+RAQZoLLK mw+9gQWj+EV8fu36ybM1Aeh3W512EbIYrBelr1Mee0YQubeLpJo4iES15Nsk8JJhBzlU uCtdWW6pi6TgJUJpJTOwFb4WI6WLpmCT2oySAg4jHnEtCCiwreBiUEQ/IqTHH3sm4aDD 1JtVWGJeBcNavwjqtNJxABMMk9QAI6NjMClywmoluVDxRvAYGpKFxn8roMTDUCx7SKMf oWWw== 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=vsND6sy6I+QwvkYR/gOiWgho5gdr0wIGS0oVQSMFTYk=; b=PROAdhNOcFH/I8nEogPFIGwKuypXrTkV58VFzLOzIdVDN4bhgMqEvaWKeLeP34q25d VvzF3m7nVMj4d4clg6oWr6HNjyFBLAbn8VFc1ns3P3MeA1RAT5Bzw1GtOqdUv01tbfif EMf6HSvXVRYHqoHn+uzrv7Oi0IRMiYHIK/IvhWj5xwMok91tfrVpMc5tUV9qA67GiG36 q1TpumquAa/7hg+V20sZIHPKzW+ybvbHMo3nND8OfkBo5uoDM5P5wX8EMdXBdESe2edG wMZ6CqA+xlf6ZowtB0KddR/aJKp67iIr3WeggOD6+ahYgmMdr10zk13s1V3p6BqYyH6W olJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fQaZTylO; 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 ay16si21406520jab.96.2021.07.19.08.43.02; Mon, 19 Jul 2021 08:43:02 -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=fQaZTylO; 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 S242262AbhGSPCT (ORCPT + 12 others); Mon, 19 Jul 2021 11:02:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:52766 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343704AbhGSO7U (ORCPT ); Mon, 19 Jul 2021 10:59:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1E9BC61283; Mon, 19 Jul 2021 15:37:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626709023; bh=kH0ztzjTDpwSK5QeTbad/iCJMkXvG2jh8hJ0rTfdHhE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fQaZTylOk5gUi553BhmWVS9xFlXX8N4vmM0GM30OvQ09TS/qApS/FdQTJV7+97DpX d58hCRtkq9l/LZigkV08XJx9g8XaStWrHtD+lN8Cbg7rmjcGo5QdMQKT54C0rpJ0dP 3BrrKswYDdvgrsyICTFywJvTiDPsWicvwPiRQipU= 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.19 180/421] iio: prox: as3935: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:49:51 +0200 Message-Id: <20210719144952.666978873@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@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 f130388a16a0..9069eec46093 100644 --- a/drivers/iio/proximity/as3935.c +++ b/drivers/iio/proximity/as3935.c @@ -61,7 +61,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; }; @@ -227,8 +231,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);