From patchwork Mon Jul 20 15:36:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 237289 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2094845ilg; Mon, 20 Jul 2020 08:46:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJywI1eulGjBX6N2Sluv8RiSXmkAZhYcIHvHf3cyEhyr4uzNL7HGjLAiKT6aqMT7AH9c/few X-Received: by 2002:a17:906:3446:: with SMTP id d6mr20641115ejb.323.1595259994622; Mon, 20 Jul 2020 08:46:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595259994; cv=none; d=google.com; s=arc-20160816; b=lix4S0JZMrH5s+MWX888R4OaKlyACls4cSXt9OKb4CRlyJwIK0uFU0RFHTS69zPxqE srZR5oFUXyblEIHH9tpdEqZca1tlUIMa4nUX6FA04rFsZ0zS+LRtlN9so28YHfSL7gSy kppGKS78+5vuR9ZgdMQMwjlsYrFsrJHFq/6sGgB7/hTMTHYLBTOR5TBkNDbQfUS+PG77 9aJZ78lqcB1VEOzQF0xziIbhO4T1VtI8bOJ7XSGWBcOUbL1TGxBw/wBsqkc+8xx45IXE nk9FT4y6Tk40gaxebK4HeWYJpV/w4xlRiinPJuiV/4BKsuUJl/aZTyVoM+8lvAxEVvlX ROzA== 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=FyEfiEanleHIkCwrmFojBZ2sZnDFFvemdHTFLx31pNg=; b=pI5FPZu7DTkfOjtrgq6HcB1Ao6lOOJAzwXVAaCN5xjUlqeO4rEzwYdODofOtHU31/Z o4Jzor7oCH49+TAMpFgL/7jNYr5GjF/49cE4JDfHGUfb/z9cl7zc3b1KCwuRiJEdrmBn NC71+4UyNoe3yFzOAoj+SJ9LDSRQ7Rf4TAVVG6lVKXe6mA1tXSVzB5cC3O5nqSQkJkun LpWOoqCYBS863vVJh1NRw9XiRukzpXbqWkjThKAqLuvKNabnjsNCA1V0HLhtLHDswHYT 8m3BQsHAA4IeGA1oqClE09ogXWFjrZX32ECc+z+TOUKL263MLcJEi911OMFNzvEX0Q+g fSGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ftgO3Vl4; 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 dv20si10688886ejb.582.2020.07.20.08.46.34; Mon, 20 Jul 2020 08:46:34 -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=ftgO3Vl4; 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 S1730205AbgGTPqd (ORCPT + 15 others); Mon, 20 Jul 2020 11:46:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:41222 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730193AbgGTPqc (ORCPT ); Mon, 20 Jul 2020 11:46:32 -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 DCBE122CBB; Mon, 20 Jul 2020 15:46:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595259991; bh=eVx2whG+iEhdi/wNAA8mHJvtFWijfFiSbn2YqjBTA2Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ftgO3Vl4nFvcUaWz2or1HQzGYwARTZDrDY0Y+cCYuAZS1s4xPQlrzn2kGRTXS8fvl Wi8fPLSmAimXowoWgITIpwtDJKmu0dEVnhegOV4nR0sBOVFdDjtQ+qtfdNKOp80tMc LYbzLrLfRoSEdDTszfZhL2wK+MW529NGspHNHyiU= 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 4.14 067/125] iio:pressure:ms5611 Fix buffer element alignment Date: Mon, 20 Jul 2020 17:36:46 +0200 Message-Id: <20200720152806.254762720@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152802.929969555@linuxfoundation.org> References: <20200720152802.929969555@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 @@ -215,16 +215,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: