From patchwork Tue Jun 9 17:45:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 187693 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp768122ilo; Tue, 9 Jun 2020 11:01:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyIShOJlijRelm7Y4/eHXxwJGmMWQnawrB7HojYOjmB/OGyQaSRoC+KM+23dt535mjPFLfz X-Received: by 2002:a17:906:abca:: with SMTP id kq10mr26017418ejb.242.1591725716555; Tue, 09 Jun 2020 11:01:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591725716; cv=none; d=google.com; s=arc-20160816; b=lCwE2ZUFZXWaX/+KA8tkI9Zp27LKbBbOYspW8R4vELYwiq8zUHmGYjoUTv6IyK3H6t sKPvbK/TthTYJcIcN1nYo+NcIQgmY+6CNuQZZ+o5nzVptnaTp+aRARYjhX198+yivBLk 76vZfYY+sObgDD29UUE/P9LYhK0sYkz6oGauR7ZCWLguJvVF+N/J4TXRqP8tsTfOUBUm PlLl5c+OOvEWPfyyFUeM6ubqljWJSKwQwZDfqDB32YdYL5qUs16c2yHRGzYUq0lwM+1h vyqI5Re6i3lmzEZlVcKp1VXRyRW3FHC5dlW2lB7bKB7aUzwnjQV4YmBseHd750XN6LTE UHOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bY+5RgWAuj4+Fukc/KBqnT65+4+MKFT1kIjxWaD0A6Q=; b=x4oqfwRBiQ95q2YPxEnMNo9WfBq78ze2e36QXornzEU+24wKiY2nQgWIeWRu3CGh7+ 3zI82fOl12S33kd4ex/Dhy3aFUYQb9T37KbSx8hjjKhILBA6avFKXFIJ3fJY+8oC2l3x 12Mp2O5jmmvFbVy44hl+QMqym08lGd9uVzhKZ3VtBd0mQ5eKT1qhyfgTiPePQc0Tq7n6 hhYMp5HHYLKaYyvwQOK7kFnQ/tjf4scrEukW7Ulu4ChasVAq36qAGHEPaigtMBCx0hC4 u5lKiCYYLyKgBJK/91xL2MTIPhAfGDoPp+NPgwJs9y2h159ZPr+Lasridd9LaYCf7uQV n5Pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KTfcrRVN; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id sa14si10609583ejb.297.2020.06.09.11.01.56; Tue, 09 Jun 2020 11:01:56 -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=@kernel.org header.s=default header.b=KTfcrRVN; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387494AbgFISBx (ORCPT + 15 others); Tue, 9 Jun 2020 14:01:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:45192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733050AbgFIRxx (ORCPT ); Tue, 9 Jun 2020 13:53:53 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3299F20734; Tue, 9 Jun 2020 17:53:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591725232; bh=9QiSaFPCF+LjbweQTWvY4JtLf48Yd8AZc7D1koPx13M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KTfcrRVN+Q4ElyHH+62b5l9J2IzMldIdirPp5+FZ6K+2FeD8llzJygHBAwpP1oJxa A9fha9y6+ihvsuOzdXV2CUZ922vzuegk9gNYk4JX1/1w3iqNDTtfcxTnOfUXwLmEPD 8uknm97IvXwXD3ELlgLPYLBtaM7wVn/8C6iAoOfw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lars-Peter Clausen , Jonathan Cameron , Stable@vger.kernel.org, Tomasz Duszynski Subject: [PATCH 5.6 23/41] iio:chemical:sps30: Fix timestamp alignment Date: Tue, 9 Jun 2020 19:45:25 +0200 Message-Id: <20200609174114.336417041@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200609174112.129412236@linuxfoundation.org> References: <20200609174112.129412236@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jonathan Cameron commit a5bf6fdd19c327bcfd9073a8740fa19ca4525fd4 upstream. One of a class of bugs pointed out by Lars in a recent review. iio_push_to_buffers_with_timestamp assumes the buffer used is aligned to the size of the timestamp (8 bytes). This is not guaranteed in this driver which uses an array of smaller elements on the stack. Fixes: 232e0f6ddeae ("iio: chemical: add support for Sensirion SPS30 sensor") Reported-by: Lars-Peter Clausen Signed-off-by: Jonathan Cameron Cc: Acked-by: Tomasz Duszynski Signed-off-by: Greg Kroah-Hartman --- drivers/iio/chemical/sps30.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- a/drivers/iio/chemical/sps30.c +++ b/drivers/iio/chemical/sps30.c @@ -230,15 +230,18 @@ static irqreturn_t sps30_trigger_handler struct iio_dev *indio_dev = pf->indio_dev; struct sps30_state *state = iio_priv(indio_dev); int ret; - s32 data[4 + 2]; /* PM1, PM2P5, PM4, PM10, timestamp */ + struct { + s32 data[4]; /* PM1, PM2P5, PM4, PM10 */ + s64 ts; + } scan; mutex_lock(&state->lock); - ret = sps30_do_meas(state, data, 4); + ret = sps30_do_meas(state, scan.data, ARRAY_SIZE(scan.data)); mutex_unlock(&state->lock); if (ret) goto err; - iio_push_to_buffers_with_timestamp(indio_dev, data, + iio_push_to_buffers_with_timestamp(indio_dev, &scan, iio_get_time_ns(indio_dev)); err: iio_trigger_notify_done(indio_dev->trig);