From patchwork Mon Jul 20 15:35:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 237500 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2113669ilg; Mon, 20 Jul 2020 09:08:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkWDq0PU5TDshljaeqhN0utTJnNGsSV5mcGWXm+KByzetQlbr2Aa+tQQTCur+/weso2ASS X-Received: by 2002:a17:906:364e:: with SMTP id r14mr20715815ejb.258.1595261307462; Mon, 20 Jul 2020 09:08:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595261307; cv=none; d=google.com; s=arc-20160816; b=hDD8SG1lohpWyT8gYJAmrTwaKr15ZAAeHYwzeiIgyw7h1jCAWmUFVqSoxtwvBkBpoJ YOZRuIgq1uMhRFcensEDbx6kcm4Gz0ZxhCh4VZ+LpVGl5GrO+RRqLRU4elczXGe6Ny6p 2sZi/CmgtlNkfnRz41fo/GTXHmnZW7Kwvd+eLWp1al/bpEx9RwQIvHaZPlDZcPAhpXzi UzHIFwFj+B8oc39ObV1HqQ0IJAzNT3MBRThQjGooD1LPOcI4y8Hb66QzUxqPOdHnvcnt 2N5fvTzFUNIcuDjaKtfK07SAt/0xMThAXbundEAXm0tiA5hqpINx5IEBOd7fiS3F6Luv bNnQ== 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=MQukpceyA3tWf1bkLRu/MatGBpYJxWayJXaiWUTaRdA=; b=pAilLXOZhZl2GBeOLsnPmkzz+ALY+kOLliFL+cJcl3s7ALgNskHwe0dlYKljNnhjer jyz2iCYFpueZyAWcDebjIH0EL4R9z7i9w/c3U0iDEZqHaNiRzE21lCaLJzuuRyRMO3eN hOBSvB5L5+3ycQQN1XRIHltLOmGHPS9RHgR9kFW/oh8EhIm/KflxFXOIqrpgQnmRxGZH 63j+vN+G7RXCs1rAAm1iD7+OoPnn4I+QXjOai8Z9F+rvGoXBU4eUY3cPrP1VH3igNCOl 9wxazKZ6Wo3WIOekxZgXQAjfiyVcEpG0VF0KkuHclS8C2Bg1iQ78sfjJ8mfIZ7nIpHAw COMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OGtFQuOv; 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 dh22si10537929edb.38.2020.07.20.09.08.26; Mon, 20 Jul 2020 09:08:27 -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=OGtFQuOv; 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 S1732750AbgGTQIZ (ORCPT + 15 others); Mon, 20 Jul 2020 12:08:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:45816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733292AbgGTQIY (ORCPT ); Mon, 20 Jul 2020 12:08:24 -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 8371F20672; Mon, 20 Jul 2020 16:08:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595261304; bh=1H5+7kJO9eaqpbN5JgnI5mNMkNUZHr0WnC6h16aXQEM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OGtFQuOvzgGf6ep0ye8lVBO/Q7/Ud4xlYkEVudlagSdc1j7LtPIrHJEk7YqfvGLC+ B52jjg7/BfYU8GmZ3/FTsdZ9v4YtUP35V1Y0X6adp8pMmsVKOPzq3ihBKqjbvSEB1s C0Sedmmb5gzudjgqDUqhvYNetpgCCpx327iyBuD0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lars-Peter Clausen , Jonathan Cameron , Tomasz Duszynski , Stable@vger.kernel.org Subject: [PATCH 5.7 067/244] iio:pressure:ms5611 Fix buffer element alignment Date: Mon, 20 Jul 2020 17:35:38 +0200 Message-Id: <20200720152829.043924062@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152825.863040590@linuxfoundation.org> References: <20200720152825.863040590@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 8db4afe163bbdd93dca6fcefbb831ef12ecc6b4d 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. Here there is no data leak possibility so use an explicit structure on the stack to ensure alignment and nice readable fashion. The forced alignment of ts isn't strictly necessary in this driver as the padding will be correct anyway (there isn't any). However it is probably less fragile to have it there and it acts as documentation of the requirement. Fixes: 713bbb4efb9dc ("iio: pressure: ms5611: Add triggered buffer support") Reported-by: Lars-Peter Clausen Signed-off-by: Jonathan Cameron Acked-by: Tomasz Duszynski Cc: Signed-off-by: Greg Kroah-Hartman --- drivers/iio/pressure/ms5611_core.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) --- a/drivers/iio/pressure/ms5611_core.c +++ b/drivers/iio/pressure/ms5611_core.c @@ -212,16 +212,21 @@ static irqreturn_t ms5611_trigger_handle struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct ms5611_state *st = iio_priv(indio_dev); - s32 buf[4]; /* s32 (pressure) + s32 (temp) + 2 * s32 (timestamp) */ + /* Ensure buffer elements are naturally aligned */ + struct { + s32 channels[2]; + s64 ts __aligned(8); + } scan; int ret; mutex_lock(&st->lock); - ret = ms5611_read_temp_and_pressure(indio_dev, &buf[1], &buf[0]); + ret = ms5611_read_temp_and_pressure(indio_dev, &scan.channels[1], + &scan.channels[0]); mutex_unlock(&st->lock); if (ret < 0) goto err; - iio_push_to_buffers_with_timestamp(indio_dev, buf, + iio_push_to_buffers_with_timestamp(indio_dev, &scan, iio_get_time_ns(indio_dev)); err: