From patchwork Tue Jun 9 17:45:37 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: 187690 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp765788ilo; Tue, 9 Jun 2020 10:59:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJqj6F28/LWOIwz57L8equVGYhUZrZvKuT5f4PT86QI3EpslBSawzA2g68+q3Ix3P2hVai X-Received: by 2002:a17:906:3e15:: with SMTP id k21mr28131248eji.525.1591725554007; Tue, 09 Jun 2020 10:59:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591725554; cv=none; d=google.com; s=arc-20160816; b=yE0kWpo4dKh5KdTPeuSl8uCbvrJJrd3m3i6+djo6LGV6SxWfXwAN1Jxh0uWb8feGq3 IlPHz625JQM6xkkqSbmOWbGBUFKLI6fXT/AvLlcCPwdRqm2CsUY17Ll1AVfUMBWpW+ui GsU0mUCajucKlO2pQUBQdy+Z+9FtTJenI3QVIoUpQqz6FF1WyvAInae6+kKij41Jl7As uu/9MYOeHTai8MzxMtY8ihVyegozU/O3JMiV8bvau8ogTGcbXg9tjxm8XY+48Vc1VD4L KKNG4tVCWVD1G5rPDnoSue/xYvaa9zL6VIdq9wuB9fCmj20lcoE+gcXl+G5gsbKq/U1k 30QA== 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=V2GZ8iFJxALPtRYtFNe0svtd1eELghFM4GHE/zBwo0qar9ZxPP3Wsj31lao4699W+X GQlfdYOWlGb49rkgAFuSpi8TDIXGnav2TQlfCAMn+mvq+IlrTn/2rXBdIEvUF3tlvR/H Ky0uqFJ/iZJRk9yjdBGLTsseJRwOTGX+ZhVaeuO4Nf06rZKXoojB46HiDi2y8W3V9XRB emMaDeEjDSO7Xav7j65sIyOxExIJUU6m04F+/AtGUfLpJytSDhMEuB9dUmumy1mGjp3E K3UAEtohLbzHuN+KhSv0QUVPIhWwYD2j5HDOWBD2vB0Bbdg3MHYo6t41I+VNSrb61Wq9 rqMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gPZoE1+0; 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 s28si10523782ejm.388.2020.06.09.10.59.13; Tue, 09 Jun 2020 10:59:13 -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=gPZoE1+0; 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 S1732157AbgFIR6u (ORCPT + 15 others); Tue, 9 Jun 2020 13:58:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:47352 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733206AbgFIRzM (ORCPT ); Tue, 9 Jun 2020 13:55:12 -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 59F3520774; Tue, 9 Jun 2020 17:55:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591725311; bh=9QiSaFPCF+LjbweQTWvY4JtLf48Yd8AZc7D1koPx13M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gPZoE1+0gH1iw84NFL4cDXmSrzXidyABkrCVJaGDEADrx3UMHqZsbmFp6soRIypd+ mV+jZYeXt8M3bdOcDW2D8xlJz+Q6/BXlOzTwQzSxWx1w6lpbFgVns1R7tIbIoP7yQy nMuk3+xUvipF9GViRlx+WphNKdx84hfDIostuuj0= 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.7 06/24] iio:chemical:sps30: Fix timestamp alignment Date: Tue, 9 Jun 2020 19:45:37 +0200 Message-Id: <20200609174149.832597490@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200609174149.255223112@linuxfoundation.org> References: <20200609174149.255223112@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);